localization

of scopes

2 files changed, 8 insertions, 18 deletions

diff --git a/src/template/gnunet-service-template.c b/src/template/gnunet-service-template.c
index 39d332226..e815398fc 100644
--- a/src/template/gnunet-service-template.c
+++ b/src/template/gnunet-service-template.c
@@ -29,16 +29,6 @@
 
 
 /**
- * List of handlers for the messages understood by this
- * service.
- */
-static struct GNUNET_SERVER_MessageHandler handlers[] = {
-  /* FIXME: add handlers here! */
-  {NULL, NULL, 0, 0}
-};
-
-
-/**
  * Task run during shutdown.
  *
  * @param cls unused
@@ -66,6 +56,10 @@ run (void *cls,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+    /* FIXME: add handlers here! */
+    {NULL, NULL, 0, 0}
+  };
   /* FIXME: do setup here */
   GNUNET_SERVER_add_handlers (server, handlers);
   GNUNET_SCHEDULER_add_delayed (sched,
diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c
index ad0da8159..a32b42379 100644
--- a/src/template/gnunet-template.c
+++ b/src/template/gnunet-template.c
@@ -52,14 +52,6 @@ run (void *cls,
   /* main code here */
 }
 
-/**
- * gnunet-template command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  /* FIMXE: add options here */
-  GNUNET_GETOPT_OPTION_END
-};
-
 
 /**
  * The main function to obtain template from gnunetd.
@@ -71,6 +63,10 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 int
 main (int argc, char *const *argv)
 {
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    /* FIMXE: add options here */
+    GNUNET_GETOPT_OPTION_END
+  };
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,