[GNUnet-SVN] r20428 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2012-03-10 22:51:54 +0100 (Sat, 10 Mar 2012)
New Revision: 20428

Modified:
   gnunet/src/util/os_priority.c
Log:
-closing of control pipe is no error

Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c       2012-03-10 21:50:28 UTC (rev 20427)
+++ gnunet/src/util/os_priority.c       2012-03-10 21:51:54 UTC (rev 20428)
@@ -326,6 +326,7 @@
 {
   struct GNUNET_DISK_FileHandle *control_pipe = cls;
   char sig;
+  ssize_t ret;
   
   LOG (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", __FUNCTION__,
        tc->reason);
@@ -336,10 +337,11 @@
     GNUNET_DISK_file_close (control_pipe);
     return;
   }
-  if (GNUNET_DISK_file_read (control_pipe, &sig, sizeof (sig)) !=
-      sizeof (sig))
+  ret = GNUNET_DISK_file_read (control_pipe, &sig, sizeof (sig));
+  if (sizeof (sig) != ret)
   {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DISK_file_read");
+    if (-1 == ret)
+      LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DISK_file_read");
     GNUNET_DISK_file_close (control_pipe);
     return;
   }