first batch of license fixes (boring)

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

diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c
index 2b24b71245376989f24c70992fc5a15f3f1cc25f..8f55c0d9a0d66c8213781ab9025643e3aec37623 100644 (file)
--- a/src/fs/gnunet-fs.c
+++ b/src/fs/gnunet-fs.c
@@ -2,20 +2,15 @@
      This file is part of GNUnet.
      Copyright (C) 2011 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 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.
-
-     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., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     Affero General Public License for more details.
 */
 /**
  * @file fs/gnunet-fs.c
@@ -114,12 +109,12 @@ main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
 
-    GNUNET_GETOPT_OPTION_SET_ONE ('i',
+    GNUNET_GETOPT_option_flag ('i',
                                   "list-indexed",
                                   gettext_noop ("print a list of all indexed files"),
                                   &list_indexed_files),
 
-    GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+    GNUNET_GETOPT_option_verbose (&verbose),
     GNUNET_GETOPT_OPTION_END
   };