From: Christian Grothoff Date: Wed, 25 Jul 2012 08:49:21 +0000 (+0000) Subject: -ignorerv X-Git-Tag: initial-import-from-subversion-38251~12345 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54e489bb761d92d10dea3150e1e236abc1f80c35;p=oweals%2Fgnunet.git -ignorerv --- diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c index d469c1949..30f5d2569 100644 --- a/src/exit/gnunet-helper-exit.c +++ b/src/exit/gnunet-helper-exit.c @@ -760,7 +760,7 @@ main (int argc, char **argv) run (fd_tun); global_ret = 0; cleanup: - close (fd_tun); + (void) close (fd_tun); return global_ret; } diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index f31d8116d..e0ceb4c57 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c @@ -493,9 +493,9 @@ GNUNET_FS_data_reader_file_ (void *cls, uint64_t offset, size_t max, void *buf, return 0; } } - GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET); - ret = GNUNET_DISK_file_read (fi->fd, buf, max); - if (-1 == ret) + if ( (GNUNET_SYSERR == + GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET)) || + (-1 == (ret = GNUNET_DISK_file_read (fi->fd, buf, max))) ) { GNUNET_asprintf (emsg, _("Could not read file `%s': %s"), fi->filename, STRERROR (errno));