src: for every AGPL3.0 file, add SPDX identifier.

[oweals/gnunet.git] / src / dv / gnunet-dv.c

diff --git a/src/dv/gnunet-dv.c b/src/dv/gnunet-dv.c
index 7e2d5b5715a592cd50eb655ef37e8d5020a3f342..90d8144e50766566c9997fadddc3e85e96bd575b 100644 (file)
--- a/src/dv/gnunet-dv.c
+++ b/src/dv/gnunet-dv.c
@@ -1,21 +1,21 @@
 /*
      This file is part of GNUnet.
-     (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 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
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dv/gnunet-dv.c
@@ -34,7 +34,7 @@ static struct GNUNET_DV_ServiceHandle *sh;
 /**
  * Was verbose specified?
  */
-static int verbose;
+static unsigned int verbose;
 
 
 /**
@@ -49,7 +49,7 @@ static void
 connect_cb (void *cls,
            const struct GNUNET_PeerIdentity *peer,
            uint32_t distance,
-            enum GNUNET_ATS_Network_Type network)
+            enum GNUNET_NetworkType network)
 {
   fprintf (stderr, "Connect: %s at %u\n",
           GNUNET_i2s (peer),
@@ -69,7 +69,7 @@ static void
 change_cb (void *cls,
           const struct GNUNET_PeerIdentity *peer,
           uint32_t distance,
-           enum GNUNET_ATS_Network_Type network)
+           enum GNUNET_NetworkType network)
 {
   fprintf (stderr, "Change: %s at %u\n",
           GNUNET_i2s (peer),
@@ -119,11 +119,9 @@ message_cb (void *cls,
  * Task run on shutdown.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-shutdown_task (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   GNUNET_DV_service_disconnect (sh);
   sh = NULL;
@@ -147,8 +145,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                  &change_cb,
                                  &disconnect_cb,
                                  &message_cb);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                               &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }
 
 
@@ -164,10 +161,10 @@ main (int argc, char *const *argv)
 {
   int res;
 
-  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    {'V', "verbose", NULL,
-     gettext_noop ("verbose output"),
-     0, &GNUNET_GETOPT_set_one, &verbose},
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+
+    GNUNET_GETOPT_option_verbose (&verbose),
+
     GNUNET_GETOPT_OPTION_END
   };