Merge remote-tracking branch 'origin/master' into credentials

[oweals/gnunet.git] / src / util / gnunet-uri.c

diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 64d8b236a4e5dbdf3c2d35dcd6b46cacfbe755f1..f69508f6728e19fe8436c52448fc3f9841527e25 100644 (file)
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -47,12 +47,12 @@ static struct GNUNET_DISK_PipeHandle *sigpipe;
  * process died) or when user presses CTRL-C.
  *
  * @param cls closure, NULL
- * @param tc scheduler context
  */
 static void
-maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+maint_child_death (void *cls)
 {
   enum GNUNET_OS_ProcessStatusType type;
+
   if ( (GNUNET_OK !=
        GNUNET_OS_process_status (p, &type, &exit_code)) ||
        (type != GNUNET_OS_PROCESS_EXITED) )
@@ -81,12 +81,14 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   if (NULL == (uri = args[0]))
   {
-    fprintf (stderr, _("No URI specified on command line\n"));
+    fprintf (stderr,
+            _("No URI specified on command line\n"));
     return;
   }
   if (0 != strncasecmp ("gnunet://", uri, strlen ("gnunet://")))
   {
-    fprintf (stderr, _("Invalid URI: does not start with `%s'\n"),
+    fprintf (stderr,
+            _("Invalid URI: does not start with `%s'\n"),
             "gnunet://");
     return;
   }