-fix #3870

[oweals/gnunet.git] / src / util / service.c

diff --git a/src/util/service.c b/src/util/service.c
index c3bb1039ec8cf1673b382c9156d8c5ac1c9aefd7..80d18d8f128f4967e2e258c2da9f482d7bfa261c 100644 (file)
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -187,7 +187,7 @@ struct GNUNET_SERVICE_Context
   /**
    * Task ID of the shutdown task.
    */
-  GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+  struct GNUNET_SCHEDULER_Task * shutdown_task;
 
   /**
    * Idle timeout for server.
@@ -389,7 +389,8 @@ get_pid_file_name (struct GNUNET_SERVICE_Context *sctx)
  *         no ACL configured)
  */
 static int
-process_acl4 (struct GNUNET_STRINGS_IPv4NetworkPolicy **ret, struct GNUNET_SERVICE_Context *sctx,
+process_acl4 (struct GNUNET_STRINGS_IPv4NetworkPolicy **ret,
+              struct GNUNET_SERVICE_Context *sctx,
               const char *option)
 {
   char *opt;
@@ -426,7 +427,8 @@ process_acl4 (struct GNUNET_STRINGS_IPv4NetworkPolicy **ret, struct GNUNET_SERVI
  *         no ACL configured)
  */
 static int
-process_acl6 (struct GNUNET_STRINGS_IPv6NetworkPolicy **ret, struct GNUNET_SERVICE_Context *sctx,
+process_acl6 (struct GNUNET_STRINGS_IPv6NetworkPolicy **ret,
+              struct GNUNET_SERVICE_Context *sctx,
               const char *option)
 {
   char *opt;
@@ -464,7 +466,8 @@ process_acl6 (struct GNUNET_STRINGS_IPv6NetworkPolicy **ret, struct GNUNET_SERVI
  *          parameter is ignore on systems other than LINUX
  */
 static void
-add_unixpath (struct sockaddr **saddrs, socklen_t * saddrlens,
+add_unixpath (struct sockaddr **saddrs,
+              socklen_t *saddrlens,
               const char *unixpath,
               int abstract)
 {
@@ -546,7 +549,7 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
   else
     disablev6 = GNUNET_NO;
 
-  if (!disablev6)
+  if (! disablev6)
   {
     /* probe IPv6 support */
     desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
@@ -559,8 +562,7 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
         return GNUNET_SYSERR;
       }
       LOG (GNUNET_ERROR_TYPE_INFO,
-           _
-           ("Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"),
+           _("Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"),
            service_name, STRERROR (errno));
       disablev6 = GNUNET_YES;
     }
@@ -620,7 +622,8 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
            (unsigned long long) sizeof (s_un.sun_path));
       unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath);
       LOG (GNUNET_ERROR_TYPE_INFO,
-          _("Using `%s' instead\n"), unixpath);
+          _("Using `%s' instead\n"),
+           unixpath);
     }
 #ifdef LINUX
     abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg,
@@ -651,7 +654,8 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
       }
       LOG (GNUNET_ERROR_TYPE_INFO,
            _("Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"),
-           service_name, STRERROR (errno));
+           service_name,
+           STRERROR (errno));
       GNUNET_free (unixpath);
       unixpath = NULL;
     }
@@ -1125,12 +1129,13 @@ write_pid_file (struct GNUNET_SERVICE_Context *sctx, pid_t pid)
  * @param tc unused
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_SERVICE_Context *service = cls;
   struct GNUNET_SERVER_Handle *server = service->server;
 
-  service->shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+  service->shutdown_task = NULL;
   if (0 != (service->options & GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN))
     GNUNET_SERVER_stop_listening (server);
   else
@@ -1671,10 +1676,10 @@ GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Context *sctx)
     }
   }
 #endif
-  if (GNUNET_SCHEDULER_NO_TASK != sctx->shutdown_task)
+  if (NULL != sctx->shutdown_task)
   {
     GNUNET_SCHEDULER_cancel (sctx->shutdown_task);
-    sctx->shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+    sctx->shutdown_task = NULL;
   }
   if (NULL != sctx->server)
     GNUNET_SERVER_destroy (sctx->server);