[GNUnet-SVN] r22894 - in gnunet/src: exit fs

[gnunet]

Author: grothoff
Date: 2012-07-25 10:49:21 +0200 (Wed, 25 Jul 2012)
New Revision: 22894

Modified:
   gnunet/src/exit/gnunet-helper-exit.c
   gnunet/src/fs/fs_api.c
Log:
-ignorerv

Modified: gnunet/src/exit/gnunet-helper-exit.c
===================================================================
--- gnunet/src/exit/gnunet-helper-exit.c        2012-07-25 08:46:49 UTC (rev 
22893)
+++ gnunet/src/exit/gnunet-helper-exit.c        2012-07-25 08:49:21 UTC (rev 
22894)
@@ -760,7 +760,7 @@
   run (fd_tun);
   global_ret = 0;
  cleanup:
-  close (fd_tun);
+  (void) close (fd_tun);
   return global_ret;
 }
 

Modified: gnunet/src/fs/fs_api.c
===================================================================
--- gnunet/src/fs/fs_api.c      2012-07-25 08:46:49 UTC (rev 22893)
+++ gnunet/src/fs/fs_api.c      2012-07-25 08:49:21 UTC (rev 22894)
@@ -493,9 +493,9 @@
       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));