gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9397 - gnunet/src/arm


From: gnunet
Subject: [GNUnet-SVN] r9397 - gnunet/src/arm
Date: Wed, 4 Nov 2009 08:13:26 -0700

Author: grothoff
Date: 2009-11-04 08:13:26 -0700 (Wed, 04 Nov 2009)
New Revision: 9397

Modified:
   gnunet/src/arm/gnunet-service-arm.c
Log:
fix

Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2009-11-04 15:07:48 UTC (rev 9396)
+++ gnunet/src/arm/gnunet-service-arm.c 2009-11-04 15:13:26 UTC (rev 9397)
@@ -673,18 +673,20 @@
       unsigned long statusCode;
      
       next = pos->next;
-      if (pos->pid == 0)
-       {
+      if ( (NULL != pos->kill_continuation) ||
+          ( (GNUNET_YES == in_shutdown) &&
+            (pos->pid == 0) ) )
+        {
+         if (prev == NULL)
+           running = next;
+         else
+           prev->next = next;
          if (NULL != pos->kill_continuation)
-           {
-             if (prev == NULL)
-               running = next;
-             else
-               prev->next = next;
-             pos->kill_continuation (pos->kill_continuation_cls, pos);     
-           }
+           pos->kill_continuation (pos->kill_continuation_cls, pos);
+         else
+           free_entry (pos);
          continue;
-       }
+        }
       if ( (GNUNET_SYSERR == (ret = GNUNET_OS_process_status(pos->pid, 
                                                             &statusType,
                                                             &statusCode))) ||
@@ -710,20 +712,6 @@
          statstr = _( /* process termination method */ "unknown");
          statcode = 0;
        }    
-      if ( (NULL != pos->kill_continuation) ||
-          ( (GNUNET_YES == in_shutdown) &&
-            (pos->pid == 0) ) )
-        {
-         if (prev == NULL)
-           running = next;
-         else
-           prev->next = next;
-         if (NULL != pos->kill_continuation)
-           pos->kill_continuation (pos->kill_continuation_cls, pos);
-         else
-           free_entry (pos);
-         continue;
-        }
       if (GNUNET_YES != in_shutdown)
        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                    _("Service `%s' terminated with status %s/%d, will try to 
restart it!\n"),





reply via email to

[Prev in Thread] Current Thread [Next in Thread]