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

[gnunet]

Author: grothoff
Date: 2011-09-18 10:15:49 +0200 (Sun, 18 Sep 2011)
New Revision: 16922

Modified:
   gnunet/src/util/service.c
   gnunet/src/util/test_service.c
Log:
better error handling

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2011-09-18 07:19:47 UTC (rev 16921)
+++ gnunet/src/util/service.c   2011-09-18 08:15:49 UTC (rev 16922)
@@ -1514,7 +1514,7 @@
                     enum GNUNET_SERVICE_Options opt, GNUNET_SERVICE_Main task,
                     void *task_cls)
 {
-#define HANDLE_ERROR do { err = 1; GNUNET_break (0); goto shutdown; } while (0)
+#define HANDLE_ERROR do { GNUNET_break (0); goto shutdown; } while (0)
 
   int err;
   char *cfg_fn;
@@ -1539,7 +1539,7 @@
     GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION),
     GNUNET_GETOPT_OPTION_END
   };
-  err = 0;
+  err = 1;
   do_daemonize = 0;
   logfile = NULL;
   loglev = GNUNET_strdup ("WARNING");
@@ -1587,6 +1587,7 @@
 #endif
   }
   /* actually run service */
+  err = 0;
   GNUNET_SCHEDULER_run (&service_task, &sctx);
 
   /* shutdown */

Modified: gnunet/src/util/test_service.c
===================================================================
--- gnunet/src/util/test_service.c      2011-09-18 07:19:47 UTC (rev 16921)
+++ gnunet/src/util/test_service.c      2011-09-18 08:15:49 UTC (rev 16922)
@@ -75,6 +75,7 @@
                                        &build_msg, client);
 }
 
+
 static void
 do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -95,14 +96,13 @@
   ok = 0;
 }
 
+
 static struct GNUNET_SERVER_MessageHandler myhandlers[] = {
   {&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)},
   {NULL, NULL, 0, 0}
 };
 
 
-
-
 static void
 runner (void *cls, struct GNUNET_SERVER_Handle *server,
         const struct GNUNET_CONFIGURATION_Handle *cfg)