-fixes

[oweals/gnunet.git] / src / util / test_peer.c

diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index 395d40712a6c79b2a225e698b47e1312086c9ec9..2a4840102cd795aa27660cc114c4b512fe05d7b8 100644 (file)
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -29,10 +29,10 @@
 
 #define NUMBER_OF_PEERS 10
 
-#define DEBUG GNUNET_NO
+#define VERBOSE GNUNET_NO
 
 /**
- * A list of Peer ID's to play with 
+ * A list of Peer ID's to play with
  */
 static struct GNUNET_PeerIdentity pidArr[NUMBER_OF_PEERS];
 
@@ -46,7 +46,7 @@ generatePeerIdList ()
   {
     GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
                                       &pidArr[i].hashPubKey);
-#if DEBUG
+#if VERBOSE
     printf ("Peer %d: %s\n", i, GNUNET_i2s (&pidArr[i]));
 #endif
   }
@@ -69,7 +69,7 @@ check ()
     pid = GNUNET_PEER_intern (&pidArr[i]);
     if (pid != (i + 1))
     {
-      fprintf (stderr, "Unexpected Peer ID returned by intern function\n");
+      FPRINTF (stderr, "%s",  "Unexpected Peer ID returned by intern function\n");
       return 1;
     }
   }
@@ -80,7 +80,7 @@ check ()
     pid = GNUNET_PEER_intern (&pidArr[i]);
     if (pid != (i + 1))
     {
-      fprintf (stderr, "Unexpected Peer ID returned by intern function\n");
+      FPRINTF (stderr, "%s",  "Unexpected Peer ID returned by intern function\n");
       return 1;
     }
   }
@@ -99,10 +99,10 @@ check ()
   GNUNET_PEER_resolve (1, &res);
   GNUNET_assert (0 == memcmp (&res, &pidArr[0], sizeof (res)));
 
-  /* 
-   * Attempt to convert pid = 0 (which is reserved) 
+  /*
+   * Attempt to convert pid = 0 (which is reserved)
    * into a peer identity object, the peer identity memory
-   * is expected to be set to zero 
+   * is expected to be set to zero
    */
   memset (&zero, 0, sizeof (struct GNUNET_PeerIdentity));
   GNUNET_log_skip (1, GNUNET_YES);