[GNUnet-SVN] r13921 - branches/gnunet/mantis_0001616/src/util

[gnunet]

Author: durner
Date: 2010-12-16 09:35:42 +0100 (Thu, 16 Dec 2010)
New Revision: 13921

Modified:
   branches/gnunet/mantis_0001616/src/util/os_priority.c
Log:
minor

Modified: branches/gnunet/mantis_0001616/src/util/os_priority.c
===================================================================
--- branches/gnunet/mantis_0001616/src/util/os_priority.c       2010-12-15 
21:17:08 UTC (rev 13920)
+++ branches/gnunet/mantis_0001616/src/util/os_priority.c       2010-12-16 
08:35:42 UTC (rev 13921)
@@ -57,7 +57,7 @@
   struct GNUNET_DISK_FileHandle *control_pipe = (struct GNUNET_DISK_FileHandle 
*) cls;
   unsigned char code;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNUNET_OS_parent_control_handler is 
invoked because of %d\n", tc->reason);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", 
__FUNCTION__, tc->reason);
 
   if (tc->reason & (GNUNET_SCHEDULER_REASON_SHUTDOWN | 
GNUNET_SCHEDULER_REASON_TIMEOUT | GNUNET_SCHEDULER_REASON_PREREQ_DONE))
   {
@@ -67,12 +67,12 @@
   {
     if (GNUNET_DISK_file_read (control_pipe, &code, sizeof (char)) != sizeof 
(char))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DISK_file_read have failed, 
errno = %d. Closing the control pipe.\n", errno);
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DISK_file_read");
       GNUNET_DISK_npipe_close (control_pipe);
     }
     else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got control code %d\n", code);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got control code %d from 
parent\n", code);
       switch (code)
       {
         case 0:
@@ -181,7 +181,7 @@
     s = sizeof (c);
     if (GNUNET_DISK_file_write (proc->control_pipe, &c, s) != s)
     {
-#ifndef MINGW
+#if !WINDOWS || defined(__CYGWIN__)
       kill (proc->pid, proc->sig);
 #else
       DWORD dwresult, error_code;
@@ -1209,7 +1209,7 @@
 int
 GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc)
 {
-#ifndef MINGW
+#if !WINDOWS || defined(__CYGWIN__)
   if (proc->kill_timeout_task)
   {
     GNUNET_SCHEDULER_cancel (proc->kill_timeout_task);