diff options
-rw-r--r-- | src/util/service.c | 5 | ||||
-rw-r--r-- | src/util/test_service.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/util/service.c b/src/util/service.c index 9e15ae1ab..dc6a7330e 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -1514,7 +1514,7 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *serviceName, | |||
1514 | enum GNUNET_SERVICE_Options opt, GNUNET_SERVICE_Main task, | 1514 | enum GNUNET_SERVICE_Options opt, GNUNET_SERVICE_Main task, |
1515 | void *task_cls) | 1515 | void *task_cls) |
1516 | { | 1516 | { |
1517 | #define HANDLE_ERROR do { err = 1; GNUNET_break (0); goto shutdown; } while (0) | 1517 | #define HANDLE_ERROR do { GNUNET_break (0); goto shutdown; } while (0) |
1518 | 1518 | ||
1519 | int err; | 1519 | int err; |
1520 | char *cfg_fn; | 1520 | char *cfg_fn; |
@@ -1539,7 +1539,7 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *serviceName, | |||
1539 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION), | 1539 | GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION), |
1540 | GNUNET_GETOPT_OPTION_END | 1540 | GNUNET_GETOPT_OPTION_END |
1541 | }; | 1541 | }; |
1542 | err = 0; | 1542 | err = 1; |
1543 | do_daemonize = 0; | 1543 | do_daemonize = 0; |
1544 | logfile = NULL; | 1544 | logfile = NULL; |
1545 | loglev = GNUNET_strdup ("WARNING"); | 1545 | loglev = GNUNET_strdup ("WARNING"); |
@@ -1587,6 +1587,7 @@ GNUNET_SERVICE_run (int argc, char *const *argv, const char *serviceName, | |||
1587 | #endif | 1587 | #endif |
1588 | } | 1588 | } |
1589 | /* actually run service */ | 1589 | /* actually run service */ |
1590 | err = 0; | ||
1590 | GNUNET_SCHEDULER_run (&service_task, &sctx); | 1591 | GNUNET_SCHEDULER_run (&service_task, &sctx); |
1591 | 1592 | ||
1592 | /* shutdown */ | 1593 | /* shutdown */ |
diff --git a/src/util/test_service.c b/src/util/test_service.c index 4d1608191..edfe33771 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c | |||
@@ -75,6 +75,7 @@ ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
75 | &build_msg, client); | 75 | &build_msg, client); |
76 | } | 76 | } |
77 | 77 | ||
78 | |||
78 | static void | 79 | static void |
79 | do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 80 | do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
80 | { | 81 | { |
@@ -95,14 +96,13 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *client, | |||
95 | ok = 0; | 96 | ok = 0; |
96 | } | 97 | } |
97 | 98 | ||
99 | |||
98 | static struct GNUNET_SERVER_MessageHandler myhandlers[] = { | 100 | static struct GNUNET_SERVER_MessageHandler myhandlers[] = { |
99 | {&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)}, | 101 | {&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)}, |
100 | {NULL, NULL, 0, 0} | 102 | {NULL, NULL, 0, 0} |
101 | }; | 103 | }; |
102 | 104 | ||
103 | 105 | ||
104 | |||
105 | |||
106 | static void | 106 | static void |
107 | runner (void *cls, struct GNUNET_SERVER_Handle *server, | 107 | runner (void *cls, struct GNUNET_SERVER_Handle *server, |
108 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 108 | const struct GNUNET_CONFIGURATION_Handle *cfg) |