Link libgnunetblockgroup to libgnunetblock

[oweals/gnunet.git] / src / hello / address.c

diff --git a/src/hello/address.c b/src/hello/address.c
index 9b7bb2019d3894cc394adfc44c009226cbe4121c..7819c2806fee8995189e3ae4a5d157c7760f684e 100644 (file)
--- a/src/hello/address.c
+++ b/src/hello/address.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -89,10 +89,10 @@ GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer,
   addr->local_info = local_info;
   end = (char *) &addr[1];
   addr->transport_name = &end[address_length];
-  memcpy (end,
+  GNUNET_memcpy (end,
           address,
           address_length);
-  memcpy (&end[address_length],
+  GNUNET_memcpy (&end[address_length],
           transport_name,
           slen);
   return addr;
@@ -143,12 +143,14 @@ GNUNET_HELLO_address_cmp (const struct GNUNET_HELLO_Address *a1,
   if (0 != ret)
     return ret;
   if (a1->local_info != a2->local_info)
-    return ((int) a1->local_info) - ((int) a2->local_info);
+    return (((int) a1->local_info) < ((int) a2->local_info)) ? -1 : 1;
   if (a1->address_length < a2->address_length)
     return -1;
   if (a1->address_length > a2->address_length)
     return 1;
-  return memcmp (a1->address, a2->address, a1->address_length);
+  return memcmp (a1->address,
+                 a2->address,
+                 a1->address_length);
 }