-rps: merge duplicate functions

[oweals/gnunet.git] / src / testbed / generate-underlay-topology.c

diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c
index e6541a3547128b6c3f4ff1f482e357cde4e238d3..22fe98e3372a26a93476b434bc7dc6a6292900ac 100644 (file)
--- a/src/testbed/generate-underlay-topology.c
+++ b/src/testbed/generate-underlay-topology.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2014 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2014 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
@@ -14,14 +14,14 @@
 
       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.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
 */
 
 /**
  * @file testbed/generate-underlay-topology.c
  * @brief Program to generate a database file containing given underlay topology
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #include "platform.h"
@@ -165,10 +165,10 @@ setup_db (const char *dbfile)
       " ?1,"
       " ?2,"
       " ?3,"
-      " ?4," 
+      " ?4,"
       " ?5);";
   int ret;
-  
+
   ret = GNUNET_SYSERR;
   if (SQLITE_OK != sqlite3_open (dbfile, &db))
   {
@@ -218,9 +218,11 @@ run (void *cls, char *const *args, const char *cfgfile,
   unsigned int argc;
 
   argc = 0;
+  arg_uint1 = 0; /* make compilers happy */
+  arg_uint2 = 0; /* make compilers happy */
   if (NULL == args)
   {
-    LOG_ERROR (_("Need atleast 2 arguments\n"));
+    LOG_ERROR (_("Need at least 2 arguments\n"));
     return;
   }
   if (NULL == (dbfile = args[argc++]))
@@ -338,7 +340,7 @@ main (int argc, char *const argv[])
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
-  
+
   exit_result = GNUNET_SYSERR;
   ret =
       GNUNET_PROGRAM_run (argc, argv, "gnunet-underlay-topology",
@@ -364,7 +366,7 @@ main (int argc, char *const argv[])
   if (NULL != stmt_insert)
     sqlite3_finalize (stmt_insert);
   if (NULL != db)
-    sqlite3_close (db);
+    GNUNET_break (SQLITE_OK == sqlite3_close (db));
   if ((GNUNET_OK != ret) || (GNUNET_OK != exit_result))
     return 1;
   return 0;