diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-01-28 23:43:09 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-01-28 23:43:09 +0100 |
| commit | e24381784b0a56896542d1a5828a77ad0e1c40ec (patch) | |
| tree | 493e0d6ad811f563142c5de72a8b80bb5d142b93 /libdiskfs/file-get-trans.c | |
| parent | 613f84a0fcd46f2143b046b57c6c6444eafa4d4d (diff) | |
| parent | b8c728ec51696c5d17ef09a00b3b193b70a487da (diff) | |
| download | hurd-e24381784b0a56896542d1a5828a77ad0e1c40ec.tar.gz hurd-e24381784b0a56896542d1a5828a77ad0e1c40ec.tar.bz2 hurd-e24381784b0a56896542d1a5828a77ad0e1c40ec.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'libdiskfs/file-get-trans.c')
| -rw-r--r-- | libdiskfs/file-get-trans.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libdiskfs/file-get-trans.c b/libdiskfs/file-get-trans.c index 11ed439e..db5bbdad 100644 --- a/libdiskfs/file-get-trans.c +++ b/libdiskfs/file-get-trans.c @@ -28,7 +28,7 @@ diskfs_S_file_get_translator (struct protid *cred, size_t *translen) { struct node *np; - error_t error = 0; + error_t err = 0; if (!cred) return EOPNOTSUPP; @@ -48,16 +48,16 @@ diskfs_S_file_get_translator (struct protid *cred, bcopy (_HURD_SYMLINK, *trans, sizeof _HURD_SYMLINK); if (diskfs_read_symlink_hook) - error = (*diskfs_read_symlink_hook) (np, + err = (*diskfs_read_symlink_hook) (np, *trans + sizeof _HURD_SYMLINK); - if (!diskfs_read_symlink_hook || error == EINVAL) + if (!diskfs_read_symlink_hook || err == EINVAL) { - error = diskfs_node_rdwr (np, *trans + sizeof _HURD_SYMLINK, + err = diskfs_node_rdwr (np, *trans + sizeof _HURD_SYMLINK, 0, np->dn_stat.st_size, 0, cred, &amt); - if (!error) + if (!err) assert (amt == np->dn_stat.st_size); } - if (!error) + if (!err) { (*trans)[sizeof _HURD_SYMLINK + np->dn_stat.st_size] = '\0'; *translen = len; @@ -88,7 +88,7 @@ diskfs_S_file_get_translator (struct protid *cred, bcopy (buf, *trans, buflen); free (buf); *translen = buflen; - error = 0; + err = 0; } else if (S_ISFIFO (np->dn_stat.st_mode)) { @@ -99,7 +99,7 @@ diskfs_S_file_get_translator (struct protid *cred, *trans = mmap (0, len, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0); bcopy (_HURD_FIFO, *trans, sizeof _HURD_FIFO); *translen = len; - error = 0; + err = 0; } else if (S_ISSOCK (np->dn_stat.st_mode)) { @@ -110,18 +110,18 @@ diskfs_S_file_get_translator (struct protid *cred, *trans = mmap (0, len, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0); bcopy (_HURD_IFSOCK, *trans, sizeof _HURD_IFSOCK); *translen = len; - error = 0; + err = 0; } else { if (! (np->dn_stat.st_mode & S_IPTRANS)) - error = EINVAL; + err = EINVAL; else { char *string; u_int len; - error = diskfs_get_translator (np, &string, &len); - if (!error) + err = diskfs_get_translator (np, &string, &len); + if (!err) { if (len > *translen) *trans = mmap (0, len, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0); @@ -134,5 +134,5 @@ diskfs_S_file_get_translator (struct protid *cred, pthread_mutex_unlock (&np->lock); - return error; + return err; } |