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

[gnunet]

Author: harsha
Date: 2012-12-13 15:29:44 +0100 (Thu, 13 Dec 2012)
New Revision: 25450

Modified:
   gnunet/src/util/program.c
   gnunet/src/util/service.c
Log:
- osx fixes

Modified: gnunet/src/util/program.c
===================================================================
--- gnunet/src/util/program.c   2012-12-13 13:46:49 UTC (rev 25449)
+++ gnunet/src/util/program.c   2012-12-13 14:29:44 UTC (rev 25450)
@@ -78,6 +78,7 @@
 int
 GNUNET_SPEEDUP_stop_ (void);
 
+
 /**
  * Initial task called by the scheduler for each
  * program.  Runs the program-specific main task.
@@ -86,8 +87,10 @@
 program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct CommandContext *cc = cls;
+
+  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+    return;
   GNUNET_SPEEDUP_start_(cc->cfg);
-
   GNUNET_RESOLVER_connect (cc->cfg);
   cc->task (cc->task_cls, cc->args, cc->cfgfile, cc->cfg);
 }

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2012-12-13 13:46:49 UTC (rev 25449)
+++ gnunet/src/util/service.c   2012-12-13 14:29:44 UTC (rev 25450)
@@ -1504,6 +1504,8 @@
   struct GNUNET_SERVICE_Context *sctx = cls;
   unsigned int i;
 
+  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+    return;
   GNUNET_RESOLVER_connect (sctx->cfg);
   if (NULL != sctx->lsocks)
     sctx->server =