memcmp() -> GNUNET_memcmp(), first take

3 files changed, 9 insertions, 12 deletions

diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 75e99d1f8..61fdd0f24 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -584,9 +584,8 @@ hosts_directory_scan_callback (void *cls,
 
   if (  (NULL != r.hello) &&
         (NULL != r.friend_only_hello) &&
-        (0 != memcmp (&id_friend,
-                      &id_public,
-                      sizeof (id_friend))) )
+        (0 != GNUNET_memcmp (&id_friend,
+                      &id_public)) )
   {
     /* HELLOs are not for the same peer */
     GNUNET_break (0);
@@ -599,7 +598,7 @@ hosts_directory_scan_callback (void *cls,
                                                   strlen (filename),
                                                   &identity.public_key))
   {
-    if (0 != memcmp (&id, &identity, sizeof (id_friend)))
+    if (0 != GNUNET_memcmp (&id, &identity))
     {
       /* HELLOs are not for the same peer */
       GNUNET_break (0);
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 4b56b34c7..485b5e183 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -271,9 +271,8 @@ check_info (void *cls,
     return GNUNET_SYSERR;
   }
   if ( (GNUNET_YES == ic->have_peer) &&
-       (0 != memcmp (&ic->peer,
-                     &im->peer,
-                     sizeof (struct GNUNET_PeerIdentity))) )
+       (0 != GNUNET_memcmp (&ic->peer,
+                     &im->peer)) )
   {
     /* bogus message (from a different iteration call?); out of sequence! */
     LOG (GNUNET_ERROR_TYPE_ERROR,
@@ -303,9 +302,8 @@ check_info (void *cls,
       GNUNET_break (0);
       return GNUNET_SYSERR;
     }
-    if (0 != memcmp (&im->peer,
-                     &id,
-                     sizeof (struct GNUNET_PeerIdentity)))
+    if (0 != GNUNET_memcmp (&im->peer,
+                     &id))
     {
       /* malformed message */
       GNUNET_break (0);
diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
index 50118f8bb..0a9bfc083 100644
--- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
@@ -160,7 +160,7 @@ process_w_fo (void *cls,
     GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received %s HELLO for peer `%s'\n",
         (GNUNET_YES == GNUNET_HELLO_is_friend_only (hello)) ? "friend only" : "public",
         GNUNET_i2s (peer));
-    if (0 == memcmp (&pid, peer, sizeof(pid)))
+    if (0 == GNUNET_memcmp (&pid, peer))
     {
       res_cb_w_fo = GNUNET_YES;
       GNUNET_SCHEDULER_add_now (&done, NULL);
@@ -199,7 +199,7 @@ process_wo_fo (void *cls, const struct GNUNET_PeerIdentity *peer,
     GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received %s HELLO for peer `%s'\n",
         (GNUNET_YES == GNUNET_HELLO_is_friend_only (hello)) ? "friend only" : "public",
         GNUNET_i2s (peer));
-    if (0 == memcmp (&pid, peer, sizeof(pid)))
+    if (0 == GNUNET_memcmp (&pid, peer))
     {
       GNUNET_break(0);
       res_cb_wo_fo = GNUNET_YES;