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

[gnunet]

Author: grothoff
Date: 2012-03-29 14:34:33 +0200 (Thu, 29 Mar 2012)
New Revision: 20806

Modified:
   gnunet/src/util/getopt_helpers.c
   gnunet/src/util/service.c
Log:
-fix printing

Modified: gnunet/src/util/getopt_helpers.c
===================================================================
--- gnunet/src/util/getopt_helpers.c    2012-03-29 12:20:09 UTC (rev 20805)
+++ gnunet/src/util/getopt_helpers.c    2012-03-29 12:34:33 UTC (rev 20806)
@@ -79,9 +79,12 @@
   const char *trans;
   const struct GNUNET_GETOPT_CommandLineOption *opt;
 
-  printf ("%s\n%s\n", ctx->binaryOptions, gettext (about));
-  printf (_
-          ("Arguments mandatory for long options are also mandatory for short 
options.\n"));
+  if (NULL != about)
+  {
+    printf ("%s\n%s\n", ctx->binaryOptions, gettext (about));
+    printf (_
+           ("Arguments mandatory for long options are also mandatory for short 
options.\n"));
+  }
   i = 0;
   opt = ctx->allOptions;
   while (opt[i].description != NULL)

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2012-03-29 12:20:09 UTC (rev 20805)
+++ gnunet/src/util/service.c   2012-03-29 12:34:33 UTC (rev 20806)
@@ -1657,7 +1657,7 @@
     {'d', "daemonize", NULL,
      gettext_noop ("do daemonize (detach from terminal)"), 0,
      GNUNET_GETOPT_set_one, &do_daemonize},
-    GNUNET_GETOPT_OPTION_HELP (serviceName),
+    GNUNET_GETOPT_OPTION_HELP (NULL),
     GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
     GNUNET_GETOPT_OPTION_LOGFILE (&logfile),
     GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION),