-consistently use struct GNUNET_HashCode

[oweals/gnunet.git] / src / datastore / plugin_datastore_mysql.c

diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index e2c77edd8bbc3ae6093516f4c1f4acb83f4e9c77..b92877d9809e7eb7a1e9c6a78b56d1ac2b8c0305 100644 (file)
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -121,7 +121,6 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_mysql_lib.h"
 
-#define DEBUG_MYSQL GNUNET_EXTRA_LOGGING
 
 #define MAX_DATUM_SIZE 65536
 
@@ -227,10 +226,8 @@ do_delete_entry (struct Plugin *plugin, unsigned long long uid)
 {
   int ret;
 
-#if DEBUG_MYSQL
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting value %llu from gn090 table\n",
               uid);
-#endif
   ret = GNUNET_MYSQL_statement_run_prepared (plugin->mc,
                                             plugin->delete_entry_by_uid, NULL,
                                             MYSQL_TYPE_LONGLONG, &uid, GNUNET_YES, -1);
@@ -284,7 +281,7 @@ mysql_plugin_estimate_size (void *cls)
  * @return GNUNET_OK on success
  */
 static int
-mysql_plugin_put (void *cls, const GNUNET_HashCode * key, uint32_t size,
+mysql_plugin_put (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
                   const void *data, enum GNUNET_BLOCK_Type type,
                   uint32_t priority, uint32_t anonymity, uint32_t replication,
                   struct GNUNET_TIME_Absolute expiration, char **msg)
@@ -300,15 +297,15 @@ mysql_plugin_put (void *cls, const GNUNET_HashCode * key, uint32_t size,
   unsigned long hashSize;
   unsigned long hashSize2;
   unsigned long lsize;
-  GNUNET_HashCode vhash;
+  struct GNUNET_HashCode vhash;
 
   if (size > MAX_DATUM_SIZE)
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  hashSize = sizeof (GNUNET_HashCode);
-  hashSize2 = sizeof (GNUNET_HashCode);
+  hashSize = sizeof (struct GNUNET_HashCode);
+  hashSize2 = sizeof (struct GNUNET_HashCode);
   lsize = size;
   GNUNET_CRYPTO_hash (data, size, &vhash);
   if (GNUNET_OK !=
@@ -323,11 +320,9 @@ mysql_plugin_put (void *cls, const GNUNET_HashCode * key, uint32_t size,
                               MYSQL_TYPE_BLOB, &vhash, hashSize2, &hashSize2,
                               MYSQL_TYPE_BLOB, data, lsize, &lsize, -1))
     return GNUNET_SYSERR;
-#if DEBUG_MYSQL
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Inserted value `%s' with size %u into gn090 table\n",
               GNUNET_h2s (key), (unsigned int) size);
-#endif
   if (size > 0)
     plugin->env->duc (plugin->env->cls, size);
   return GNUNET_OK;
@@ -366,11 +361,9 @@ mysql_plugin_update (void *cls, uint64_t uid, int delta,
   unsigned long long lexpire = expire.abs_value;
   int ret;
 
-#if DEBUG_MYSQL
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Updating value %llu adding %d to priority and maxing exp at %llu\n",
               vkey, delta, lexpire);
-#endif
   ret =
     GNUNET_MYSQL_statement_run_prepared (plugin->mc, plugin->update_entry, NULL,
                                         MYSQL_TYPE_LONG, &delta, GNUNET_NO,
@@ -410,11 +403,11 @@ execute_select (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt
   unsigned long size;
   unsigned long long uid;
   char value[GNUNET_DATASTORE_MAX_VALUE_SIZE];
-  GNUNET_HashCode key;
+  struct GNUNET_HashCode key;
   struct GNUNET_TIME_Absolute expiration;
   MYSQL_BIND rbind[7];
 
-  hashSize = sizeof (GNUNET_HashCode);
+  hashSize = sizeof (struct GNUNET_HashCode);
   memset (rbind, 0, sizeof (rbind));
   rbind[0].buffer_type = MYSQL_TYPE_LONG;
   rbind[0].buffer = &type;
@@ -449,18 +442,16 @@ execute_select (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt
     return;
   }
   GNUNET_assert (size <= sizeof (value));
-  if ((rbind[4].buffer_length != sizeof (GNUNET_HashCode)) ||
-      (hashSize != sizeof (GNUNET_HashCode)))
+  if ((rbind[4].buffer_length != sizeof (struct GNUNET_HashCode)) ||
+      (hashSize != sizeof (struct GNUNET_HashCode)))
   {
     GNUNET_break (0);
     proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
     return;
   }
-#if DEBUG_MYSQL
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Found %u-byte value under key `%s' with prio %u, anon %u, expire %llu selecting from gn090 table\n",
               (unsigned int) size, GNUNET_h2s (&key), priority, anonymity, exp);
-#endif
   GNUNET_assert (size < MAX_DATUM_SIZE);
   expiration.abs_value = exp;
   ret =
@@ -495,8 +486,8 @@ execute_select (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt
  * @param proc_cls closure for proc
  */
 static void
-mysql_plugin_get_key (void *cls, uint64_t offset, const GNUNET_HashCode * key,
-                      const GNUNET_HashCode * vhash,
+mysql_plugin_get_key (void *cls, uint64_t offset, const struct GNUNET_HashCode * key,
+                      const struct GNUNET_HashCode * vhash,
                       enum GNUNET_BLOCK_Type type, PluginDatumProcessor proc,
                       void *proc_cls)
 {
@@ -510,8 +501,8 @@ mysql_plugin_get_key (void *cls, uint64_t offset, const GNUNET_HashCode * key,
 
   GNUNET_assert (key != NULL);
   GNUNET_assert (NULL != proc);
-  hashSize = sizeof (GNUNET_HashCode);
-  hashSize2 = sizeof (GNUNET_HashCode);
+  hashSize = sizeof (struct GNUNET_HashCode);
+  hashSize2 = sizeof (struct GNUNET_HashCode);
   memset (cbind, 0, sizeof (cbind));
   total = -1;
   cbind[0].buffer_type = MYSQL_TYPE_LONGLONG;
@@ -567,12 +558,9 @@ mysql_plugin_get_key (void *cls, uint64_t offset, const GNUNET_HashCode * key,
   }
   offset = offset % total;
   off = (unsigned long long) offset;
-#if DEBUG_MYSQL
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Obtaining %llu/%lld result for GET `%s'\n", off, total,
               GNUNET_h2s (key));
-#endif
-
   if (type != GNUNET_BLOCK_TYPE_ANY)
   {
     if (NULL != vhash)
@@ -681,7 +669,7 @@ struct ReplCtx
  *         GNUNET_NO to delete the item and continue (if supported)
  */
 static int
-repl_proc (void *cls, const GNUNET_HashCode * key, uint32_t size,
+repl_proc (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
            const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
            uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
            uint64_t uid)
@@ -775,7 +763,7 @@ mysql_plugin_get_keys (void *cls,
   const char *query = "SELECT hash FROM gn090";
   int ret;
   MYSQL_STMT *statement;
-  GNUNET_HashCode key;
+  struct GNUNET_HashCode key;
   MYSQL_BIND cbind[1];
   unsigned long length;
  
@@ -820,7 +808,7 @@ mysql_plugin_get_keys (void *cls,
   }
   while (0 == (ret = mysql_stmt_fetch (statement)))
   {
-    if (sizeof (GNUNET_HashCode) == length)
+    if (sizeof (struct GNUNET_HashCode) == length)
       proc (proc_cls, &key, 1);    
   }
   if (ret != MYSQL_NO_DATA)
@@ -881,7 +869,7 @@ struct ExpiCtx
  *         GNUNET_NO to delete the item and continue (if supported)
  */
 static int
-expi_proc (void *cls, const GNUNET_HashCode * key, uint32_t size,
+expi_proc (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
            const void *data, enum GNUNET_BLOCK_Type type, uint32_t priority,
            uint32_t anonymity, struct GNUNET_TIME_Absolute expiration,
            uint64_t uid)