Merge branch 'master' of ssh://git.gnunet.org/gnunet

2 files changed, 20 insertions, 16 deletions

diff --git a/src/include/gnunet_mysql_compat.h b/src/include/gnunet_mysql_compat.h.in
index 9fb9db30f..6218386aa 100644
--- a/src/include/gnunet_mysql_compat.h
+++ b/src/include/gnunet_mysql_compat.h.in
@@ -22,6 +22,8 @@
  *
  * @file
  * MySQL/MariaDB compatibility insanity helper header
+ * Note: gnunet_mysql_compat.h is AUTOGENERATED from gnunet_mysql_compat.h.in
+ * Please do not modify or commit gnunet_mysql_compat.h
  *
  * @defgroup mysql  MySQL library
  * Helper library to access a MySQL database.
@@ -41,15 +43,7 @@ extern "C"
 #endif
 #endif
 
-#ifndef LIBMARIADB
-#if MYSQL_VERSION_ID >= 80000
-#define MYSQL_BOOL bool
-#else
-#define MYSQL_BOOL my_bool /* MySQL < 8 wants this */
-#endif
-#else
-#define MYSQL_BOOL my_bool /* MariaDB still uses my_bool */
-#endif
+#define MYSQL_BOOL @mysql_bool@
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 1a66458db..b7ca377a9 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -801,7 +801,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
       *end = '\0';
       directive = line + 1;
 
-      if (0 == strcasecmp (directive, "INLINE"))
+      if (0 == strcasecmp (directive,
+                           "INLINE"))
       {
         const char *path = end + 1;
 
@@ -816,7 +817,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
                                        source_filename,
                                        nr);
       }
-      else if (0 == strcasecmp (directive, "INLINE-MATCHING"))
+      else if (0 == strcasecmp (directive,
+                                "INLINE-MATCHING"))
       {
         const char *path = end + 1;
 
@@ -831,7 +833,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
                                        source_filename,
                                        nr);
       }
-      else if (0 == strcasecmp (directive, "INLINE-SECRET"))
+      else if (0 == strcasecmp (directive,
+                                "INLINE-SECRET"))
       {
         char *secname = end + 1;
         char *secname_end;
@@ -881,7 +884,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
       }
       continue;
     }
-    if (('[' == line[0]) && (']' == line[line_size - 1]))
+    if ( ('[' == line[0]) &&
+         (']' == line[line_size - 1]) )
     {
       /* [value] */
       line[line_size - 1] = '\0';
@@ -923,18 +927,24 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
 
       /* remove quotes */
       i = 0;
-      if (('"' == value[0]) && ('"' == value[strlen (value) - 1]))
+      if ( ('"' == value[0]) &&
+           ('"' == value[strlen (value) - 1]) )
       {
         value[strlen (value) - 1] = '\0';
         value++;
       }
-      GNUNET_CONFIGURATION_set_value_string (cfg, section, tag, &value[i]);
+      GNUNET_CONFIGURATION_set_value_string (cfg,
+                                             section,
+                                             tag,
+                                             &value[i]);
       if (cfg->diagnostics)
       {
         set_entry_hint (cfg,
                         section,
                         tag,
-                        source_filename ? source_filename : "<input>",
+                        source_filename
+                        ? source_filename
+                        : "<input>",
                         nr);
       }
       GNUNET_free (tag);