memcmp() -> GNUNET_memcmp(), first take

16 files changed, 45 insertions, 69 deletions

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 45be0fe75..d2a09087e 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -553,9 +553,8 @@ cache_nick (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
          (oldest->last_used.abs_value_us >
           pos->last_used.abs_value_us) )
       oldest = pos;
-    if (0 == memcmp (zone,
-                     &pos->zone,
-                     sizeof (*zone)))
+    if (0 == GNUNET_memcmp (zone,
+                     &pos->zone))
     {
       oldest = pos;
       break;
@@ -592,9 +591,8 @@ get_nick_record (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone)
   {
     struct NickCache *pos = &nick_cache[i];
     if ( (NULL != pos->rd) &&
-         (0 == memcmp (zone,
-                       &pos->zone,
-                       sizeof (*zone))) )
+         (0 == GNUNET_memcmp (zone,
+                       &pos->zone)) )
     {
       nick = GNUNET_malloc (sizeof (*nick) +
                             pos->rd->data_size);
@@ -1082,12 +1080,10 @@ continue_store_activity (struct StoreActivity *sa)
          NULL != zm;
          zm = sa->zm_pos)
     {
-      if ( (0 != memcmp (&rp_msg->private_key,
-                         &zm->zone,
-                         sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) &&
-           (0 != memcmp (&zm->zone,
-                         &zero,
-                         sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) )
+      if ( (0 != GNUNET_memcmp (&rp_msg->private_key,
+                         &zm->zone)) &&
+           (0 != GNUNET_memcmp (&zm->zone,
+                         &zero)) )
         {
           sa->zm_pos = zm->next; /* not interesting to this monitor */
           continue;
@@ -1921,9 +1917,7 @@ run_zone_iteration_round (struct ZoneIteration *zi,
   start = GNUNET_TIME_absolute_get ();
   GNUNET_break (GNUNET_SYSERR !=
                 GSN_database->iterate_records (GSN_database->cls,
-                                               (0 == memcmp (&zi->zone,
-                                                             &zero,
-                                                             sizeof (zero)))
+                                               (0 == GNUNET_is_zero (&zi->zone))
                                                ? NULL
                                                : &zi->zone,
                                                zi->seq,
@@ -2220,9 +2214,7 @@ monitor_iteration_next (void *cls)
   else
     zm->iteration_cnt = zm->limit; /* use it all */
   ret = GSN_database->iterate_records (GSN_database->cls,
-                                       (0 == memcmp (&zm->zone,
-                                                     &zero,
-                                                     sizeof (zero)))
+                                       (0 == GNUNET_is_zero (&zm->zone))
                                        ? NULL
                                        : &zm->zone,
                                        zm->seq,
diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c
index e7d040ec4..f36106332 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -1583,9 +1583,8 @@ ns_lookup_result_cb (void *cls,
                  GNUNET_CONTAINER_multihashmap_remove (ns_pending,
                                                        &hc,
                                                        req));
-  GNUNET_break (0 == memcmp (key,
-                             &req->zone->key,
-                             sizeof (*key)));
+  GNUNET_break (0 == GNUNET_memcmp (key,
+                             &req->zone->key));
   GNUNET_break (0 == strcasecmp (label,
                                  get_label (req)));
   for (unsigned int i=0;i<rd_count;i++)
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 89eb0afa4..99fd17473 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -552,9 +552,8 @@ check_record_result (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  if (0 == memcmp (&msg->private_key,
-                   &priv_dummy,
-                   sizeof (priv_dummy)) )
+  if (0 == GNUNET_memcmp (&msg->private_key,
+                   &priv_dummy) )
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index 67715f634..99e3864c9 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -142,12 +142,9 @@ check_result (void *cls,
   const char *rd_ser_tmp;
 
   (void) cls;
-  if ( (0 != memcmp (&lrm->private_key,
-                     &zm->zone,
-                     sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) &&
-       (0 != memcmp (&zero,
-                     &zm->zone,
-                     sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) )
+  if ( (0 != GNUNET_memcmp (&lrm->private_key,
+                     &zm->zone)) &&
+       (0 != GNUNET_is_zero (&zm->zone)) )
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c
index 5da958aad..156f9227c 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/namestore/perf_namestore_api_zone_iteration.c
@@ -241,9 +241,8 @@ zone_proc (void *cls,
     return;
   }
   GNUNET_free (wrd);
-  if (0 != memcmp (zone,
-                   privkey,
-                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 != GNUNET_memcmp (zone,
+                   privkey))
   {
     res = 5;
     GNUNET_break (0);
diff --git a/src/namestore/plugin_namestore_heap.c b/src/namestore/plugin_namestore_heap.c
index 01cf592ea..8fe03764d 100644
--- a/src/namestore/plugin_namestore_heap.c
+++ b/src/namestore/plugin_namestore_heap.c
@@ -592,9 +592,8 @@ iterate_zones (void *cls,
   if (0 == ic->limit)
     return GNUNET_NO;
   if ( (NULL != ic->zone) &&
-       (0 != memcmp (&entry->private_key,
-                     ic->zone,
-                     sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) )
+       (0 != GNUNET_memcmp (&entry->private_key,
+                     ic->zone)) )
     return GNUNET_YES;
   ic->pos++;
   if (ic->offset > 0)
@@ -676,9 +675,8 @@ zone_to_name (void *cls,
   struct FlatFileEntry *entry = value;
 
   (void) key;
-  if (0 != memcmp (&entry->private_key,
-                   ztn->zone,
-                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 != GNUNET_memcmp (&entry->private_key,
+                   ztn->zone))
     return GNUNET_YES;
 
   for (unsigned int i = 0; i < entry->record_count; i++)
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c
index 1257701e9..392a2521d 100644
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/namestore/test_namestore_api_lookup_nick.c
@@ -111,7 +111,7 @@ lookup_it (void *cls,
   int found_record = GNUNET_NO;
   int found_nick = GNUNET_NO;
 
-  if (0 != memcmp(privkey, zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 != GNUNET_memcmp(privkey, zone))
   {
     GNUNET_break(0);
     GNUNET_SCHEDULER_cancel (endbadly_task);
diff --git a/src/namestore/test_namestore_api_lookup_private.c b/src/namestore/test_namestore_api_lookup_private.c
index 2615f52c8..cf9bfc20c 100644
--- a/src/namestore/test_namestore_api_lookup_private.c
+++ b/src/namestore/test_namestore_api_lookup_private.c
@@ -103,9 +103,8 @@ lookup_it (void *cls,
 {
   nsqe = NULL;
 
-  if (0 != memcmp (privkey,
-                   zone,
-                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 != GNUNET_memcmp (privkey,
+                   zone))
   {
     GNUNET_break(0);
     GNUNET_SCHEDULER_cancel (endbadly_task);
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index c85ec8457..8fbeb6479 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -156,9 +156,8 @@ zone_proc (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Comparing results name %s\n",
               name);
-  if (0 != memcmp (zone_key,
-                   privkey,
-                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 != GNUNET_memcmp (zone_key,
+                   privkey))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Monitoring returned wrong zone key\n");
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
index 64bfb6949..e54046c85 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -150,9 +150,8 @@ zone_proc (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Comparing results name %s\n",
               name);
-  if (0 != memcmp (zone_key,
-                   privkey,
-                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 != GNUNET_memcmp (zone_key,
+                   privkey))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Monitoring returned wrong zone key\n");
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index fa641954b..94331f89e 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -160,9 +160,8 @@ zone_proc (void *cls,
   int failed = GNUNET_NO;
 
   GNUNET_assert (NULL != zone);
-  if (0 == memcmp (zone,
-                   privkey,
-                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 == GNUNET_memcmp (zone,
+                   privkey))
   {
     if (0 == strcmp (label, s_name_1))
     {
@@ -207,9 +206,8 @@ zone_proc (void *cls,
       GNUNET_break (0);
     }
   }
-  else if (0 == memcmp (zone,
-                        privkey2,
-                        sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  else if (0 == GNUNET_memcmp (zone,
+                        privkey2))
   {
     if (0 == strcmp (label, s_name_3))
     {
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c
index 9df6c98cc..069c6d831 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -171,13 +171,13 @@ zone_proc (void *cls,
   int failed = GNUNET_NO;
 
   GNUNET_assert (NULL != zone);
-  if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 == GNUNET_memcmp (zone, privkey))
   {
     failed = check_zone_1 (label, rd_count, rd);
     if (GNUNET_YES == failed)
       GNUNET_break (0);
   }
-  else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  else if (0 == GNUNET_memcmp (zone, privkey2))
   {
     failed = check_zone_2 (label, rd_count, rd);
     if (GNUNET_YES == failed)
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index cbcd94cd5..e3c6d698a 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -142,9 +142,8 @@ zone_proc (void *cls,
   int failed = GNUNET_NO;
 
   GNUNET_assert (NULL != zone);
-  if (0 == memcmp (zone,
-                   privkey,
-                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 == GNUNET_memcmp (zone,
+                   privkey))
   {
     if (0 == strcmp (label, s_name_1))
     {
@@ -189,7 +188,7 @@ zone_proc (void *cls,
       GNUNET_break (0);
     }
   }
-  else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  else if (0 == GNUNET_memcmp (zone, privkey2))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Received data for not requested zone\n");
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index 38da3136c..28f424b23 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -130,7 +130,7 @@ zone_proc (void *cls,
   int failed = GNUNET_NO;
 
   GNUNET_assert (NULL != zone);
-  if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  if (0 == GNUNET_memcmp (zone, privkey))
   {
     if (0 == strcmp (label, s_name_1))
     {
@@ -174,7 +174,7 @@ zone_proc (void *cls,
       GNUNET_break (0);
     }
   }
-  else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  else if (0 == GNUNET_memcmp (zone, privkey2))
   {
     if (0 == strcmp (label, s_name_3))
     {
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index 5d6444145..cb580572e 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -132,9 +132,8 @@ zone_to_name_proc (void *cls,
       GNUNET_break (0);
     }
     if ( (NULL == zone_key) ||
-         (0 != memcmp (zone_key,
-                       privkey,
-                       sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))))
+         (0 != GNUNET_memcmp (zone_key,
+                       privkey)))
     {
       fail = GNUNET_YES;
       GNUNET_break (0);
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c
index 9c978749f..b81900931 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -120,9 +120,8 @@ test_record (void *cls,
           (id % 241),
           sizeof (tzone_private_key));
   GNUNET_assert (0 == strcmp (label, tname));
-  GNUNET_assert (0 == memcmp (&tzone_private_key,
-                              private_key,
-                              sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)));
+  GNUNET_assert (0 == GNUNET_memcmp (&tzone_private_key,
+                              private_key));
 }