-docu, style fixes

[oweals/gnunet.git] / src / util / gnunet-ecc.c

diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c
index 1a183e854fcb3d9126429d54d6f9737c622ac7ef..f725e4ff3e3c436477b64402c76ec83ef8c32769 100644 (file)
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -84,11 +84,12 @@ create_keys (const char *fn, const char *prefix)
   if (NULL != prefix)
   {
     strncpy (vanity, prefix, KEY_STR_LEN);
-    len = strlen (vanity);
+    len = GNUNET_MIN (strlen (prefix), KEY_STR_LEN);
     n = len * 5 / 8;
     rest = len * 5 % 8;
 
-    memset (&vanity[len], 0, KEY_STR_LEN - len);
+    memset (&vanity[len], '0', KEY_STR_LEN - len);
+    vanity[KEY_STR_LEN] = '\0';
     GNUNET_assert (GNUNET_OK ==
                    GNUNET_CRYPTO_eddsa_public_key_from_string (vanity,
                                                                KEY_STR_LEN,
@@ -108,7 +109,8 @@ create_keys (const char *fn, const char *prefix)
     }
     else
     {
-      mask = 0;
+      /* Just so old (debian) versions of GCC calm down with the warnings. */
+      mask = target_byte = 0;
     }
     s = GNUNET_CRYPTO_eddsa_public_key_to_string (&target_pub);
     fprintf (stderr,
@@ -186,13 +188,16 @@ create_keys (const char *fn, const char *prefix)
 
 
 static void
-print_hex (char *msg, void *buf, size_t size)
+print_hex (const char *msg,
+           const void *buf,
+           size_t size)
 {
   size_t i;
+
   printf ("%s: ", msg);
   for (i = 0; i < size; i++)
   {
-    printf ("%02hhx", ((char *)buf)[i]);
+    printf ("%02hhx", ((const char *)buf)[i]);
   }
   printf ("\n");
 }