[gnunet] branch master updated (dc5501061 -> ab66a7a9d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from dc5501061 SETU: don't leak 
Operation.{message_control_flow,inquiries_sent}.
     new 584ae66d0 Revert "DHT: remove "memory leak" in gnunet-dht-{get,put}."
     new ab66a7a9d MYSQL: Another jab at proper my_bool detection.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac             | 12 +++++-------
 src/dht/gnunet-dht-get.c | 26 ++++++++++++--------------
 src/dht/gnunet-dht-put.c |  9 ++++-----
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1472877d1..3e7b42a12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -940,14 +940,12 @@ mysql_bool="bool"
 AS_IF([test "x$mysql" = "xtrue"],
   [AC_MSG_CHECKING([for my_bool])
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-     [[#include <mysql/mysql.h>]],
-     [[#ifndef my_bool
-#no my_bool found
-#endif]])],
-      [AC_MSG_RESULT([yes])
-       mysql_bool="my_bool"],
+     [[#include <mysql/mysql.h>]
+      [typedef int my_bool;]])], # Hint: this fails if my_bool is defined 
already
       [AC_MSG_RESULT([no])
-       mysql_bool="bool"])])
+       mysql_bool="bool"],
+      [AC_MSG_RESULT([yes])
+       mysql_bool="my_bool"])])
 
 AC_SUBST([mysql_bool])
 
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index 4a071dbad..1ae9235f8 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -329,20 +329,18 @@ main (int argc, char *const *argv)
       GNUNET_STRINGS_get_utf8_args (argc, argv,
                                     &argc, &argv))
     return 2;
-  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (
-           argc,
-           argv,
-           "gnunet-dht-get",
-           gettext_noop (
-             "Issue a GET request to the GNUnet DHT, prints results."),
-           options,
-           &run,
-           NULL))
-        ? ret
-        : 1;
-  GNUNET_free (argv);
-  return ret;
+  return (GNUNET_OK ==
+          GNUNET_PROGRAM_run (
+            argc,
+            argv,
+            "gnunet-dht-get",
+            gettext_noop (
+              "Issue a GET request to the GNUnet DHT, prints results."),
+            options,
+            &run,
+            NULL))
+         ? ret
+         : 1;
 }
 
 
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index 2281ff56b..531107ef2 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -226,12 +226,13 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_OPTION_END
   };
 
+
   if (GNUNET_OK !=
       GNUNET_STRINGS_get_utf8_args (argc, argv,
                                     &argc, &argv))
     return 2;
   expiration = GNUNET_TIME_UNIT_HOURS;
-  ret = (GNUNET_OK ==
+  return (GNUNET_OK ==
           GNUNET_PROGRAM_run (
             argc,
             argv,
@@ -241,10 +242,8 @@ main (int argc, char *const *argv)
             options,
             &run,
             NULL))
-        ? ret
-        : 1;
-  GNUNET_free (argv);
-  return ret;
+         ? ret
+         : 1;
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.