-fix warnings

3 files changed, 16 insertions, 34 deletions

diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
index 843d3ccb3..8da7e5397 100644
--- a/src/include/gnunet_mysql_lib.h
+++ b/src/include/gnunet_mysql_lib.h
@@ -41,11 +41,15 @@ extern "C"
 #endif
 #endif
 
-#ifdef HAVE_MYSQL8
+#ifndef LIBMARIADB
+#ifdef HAVE_MYSQL8 && !LIBMARIADB
   typedef bool MYSQL_BOOL;
 #else
   typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this
 #endif
+#else
+  typedef my_bool MYSQL_BOOL; //MariaDB still uses my_bool
+#endif
 
 
 /**
diff --git a/src/namestore/gnunet-namestore-zonefile.c b/src/namestore/gnunet-namestore-zonefile.c
index 26906d140..5cf25abec 100644
--- a/src/namestore/gnunet-namestore-zonefile.c
+++ b/src/namestore/gnunet-namestore-zonefile.c
@@ -271,13 +271,16 @@ parse_origin (char *token, char *origin)
 {
   char *next;
   next = strchr (token, ';');
-  if (NULL != next)
-    next[0] = '\0';
+  if (NULL == next)
+    return GNUNET_SYSERR;
+  next[0] = '\0';
   next = strchr (token, ' ');
-  if (NULL != next)
-    next[0] = '\0';
+  if (NULL == next)
+    return GNUNET_SYSERR;
+  next[0] = '\0';
   strcpy (origin, token);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Origin is: %s\n", origin);
+  return GNUNET_OK;
 }
 
 static void
@@ -300,7 +303,6 @@ origin_create_cb (void *cls, const struct GNUNET_IDENTITY_PrivateKey *pk,
 static void
 origin_lookup_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
 
   el = NULL;
 
@@ -384,7 +386,7 @@ parse (void *cls)
   parse_task = NULL;
   /* use filename provided as 1st argument (stdin by default) */
   int ln = 0;
-  while (res = fgets (buf, sizeof(buf), stdin))                     /* read each line of input */
+  while ((res = fgets (buf, sizeof(buf), stdin)))                     /* read each line of input */
   {
     ln++;
     ttl_line = 0;
@@ -512,7 +514,8 @@ parse (void *cls)
       if (ZS_READY == state)
       {
         fprintf (stderr,
-                 _ ("You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"));
+                 _ (
+                   "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"));
         ret = 1;
         GNUNET_SCHEDULER_shutdown ();
         return;
@@ -661,10 +664,8 @@ tx_start (void *cls, int32_t success, const char *emsg)
 static void
 identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
 
   el = NULL;
-
   if (NULL == ego)
   {
     if (NULL != ego_name)
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c
index 4cf5e690a..220cf1f99 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -412,7 +412,7 @@ shutdown_task (void *cls)
   struct OpenSignJob *job;
 
   (void) cls;
-  in_shutdown == GNUNET_YES;
+  in_shutdown = GNUNET_YES;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Shutting down!\n");
   if (NULL != notification_pipe)
@@ -820,11 +820,9 @@ perform_dht_put (const struct GNUNET_IDENTITY_PrivateKey *key,
   struct GNUNET_GNSRECORD_Data rd_public[rd_count];
   struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_GNSRECORD_Block *block_priv;
-  struct GNUNET_HashCode query;
   struct GNUNET_TIME_Absolute expire_pub;
   size_t block_size;
   unsigned int rd_public_count = 0;
-  struct GNUNET_DHT_PutHandle *ret;
   char *emsg;
 
   if (GNUNET_OK !=
@@ -1136,25 +1134,6 @@ publish_zone_dht_start (void *cls)
 
 
 /**
- * Continuation called from DHT once the PUT operation triggered
- * by a monitor is done.
- *
- * @param cls a `struct DhtPutActivity`
- */
-static void
-dht_put_monitor_continuation (void *cls)
-{
-  struct DhtPutActivity *ma = cls;
-
-  ma_queue_length--;
-  GNUNET_CONTAINER_DLL_remove (ma_head,
-                               ma_tail,
-                               ma);
-  GNUNET_free (ma);
-}
-
-
-/**
  * Store GNS records in the DHT.
  *
  * @param key key of the zone
@@ -1175,11 +1154,9 @@ perform_dht_put_monitor (const struct GNUNET_IDENTITY_PrivateKey *key,
   struct GNUNET_GNSRECORD_Data rd_public[rd_count];
   struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_GNSRECORD_Block *block_priv;
-  struct GNUNET_HashCode query;
   struct GNUNET_TIME_Absolute expire_pub;
   size_t block_size;
   unsigned int rd_public_count = 0;
-  struct GNUNET_DHT_PutHandle *ret;
   char *emsg;
 
   if (GNUNET_OK !=