From efa495524a5be052ee67793e4bcf600ba05e149c Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 9 Nov 2009 22:40:03 +0000
Subject: code clean up

---
 src/util/test_peer.c | 116 +++++++++++++++++++++++----------------------------
 1 file changed, 52 insertions(+), 64 deletions(-)

(limited to 'src/util/test_peer.c')

diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index 63610e420..0f4a227d3 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -30,88 +30,76 @@
 #define NUMBER_OF_PEERS 10
 /*#define DEBUG*/
 
-/* Global Variables */
-static struct GNUNET_PeerIdentity** pidArr; /* 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];
 
 
 static void generatePeerIdList()
 {
-	int i; /* Loop Index */
-
-	pidArr = GNUNET_malloc(NUMBER_OF_PEERS * sizeof(struct GNUNET_PeerIdentity*));
-	for (i = 0; i < NUMBER_OF_PEERS; i++ ) {
-		pidArr[i] = GNUNET_malloc(sizeof(struct GNUNET_PeerIdentity));
-		GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &(pidArr[i]->hashPubKey));
+  int i;
 
+  for (i = 0; i < NUMBER_OF_PEERS; i++ ) {
+    GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &pidArr[i].hashPubKey);    
 #ifdef DEBUG
-		{
-			struct GNUNET_CRYPTO_HashAsciiEncoded hashAsciiEncoded;
-			GNUNET_CRYPTO_hash_to_enc(&(pidArr[i]->hashPubKey), &hashAsciiEncoded);
-			printf ("I'm Peer: %s\n", (char*) &hashAsciiEncoded);
-		}
+    printf ("Peer %d: %s\n", 
+	    i,
+	    GNUNET_i2s (&pidArr[i]));  
 #endif
-	}
+  }
 }
 
-static void destroyPeerIdList()
-{
-	int i;
-	for (i = 0; i < NUMBER_OF_PEERS; i++) {
-		GNUNET_free(pidArr[i]);
-	}
-	GNUNET_free(pidArr);
-}
 
 static int check()
 {
-	int i = 0;
-	GNUNET_PEER_Id pid;
-	
-	/* Insert Peers into PeerEntry table and hashmap */
-	for (; i < NUMBER_OF_PEERS; i++) {
-		pid = GNUNET_PEER_intern(pidArr[i]);
-		if ( pid != (i + 1)) {
-			fprintf(stderr, "Unexpected Peer ID returned by intern function \n");
-			return 1;
-		}
-	}
+  int i;
+  GNUNET_PEER_Id pid;
 	
-	/* Referencing the first 3 peers once again */
-	for (i = 0; i < 3; i++) {
-		 pid = GNUNET_PEER_intern(pidArr[i]);
-		 if (pid != (i + 1)) {
-			 fprintf(stderr, "Unexpcted Peer ID returned by intern function \n");
-			 return 1;
-		 }
-	}
+  /* Insert Peers into PeerEntry table and hashmap */
+  for (i=0; i < NUMBER_OF_PEERS; i++) {
+    pid = GNUNET_PEER_intern(&pidArr[i]);
+    if ( pid != (i + 1)) {
+      fprintf(stderr, "Unexpected Peer ID returned by intern function \n");
+      return 1;
+    }
+  }
 	
-	/* Dereferencing the first 3 peers once [decrementing their reference count] */
-	{
-		GNUNET_PEER_Id ids[] = {1, 2, 3};
-		GNUNET_PEER_decrement_rcs(ids, 3);
-	}
+  /* Referencing the first 3 peers once again */
+  for (i = 0; i < 3; i++) {
+    pid = GNUNET_PEER_intern(&pidArr[i]);
+    if (pid != (i + 1)) {
+      fprintf(stderr, "Unexpcted Peer ID returned by intern function \n");
+      return 1;
+    }
+  }
 	
-	/* re-referencing the first 3 peers using the change_rc function */
-	for (i = 0; i < 3; i++) {
-		GNUNET_PEER_change_rc(i, 1);
-	}
+  /* Dereferencing the first 3 peers once [decrementing their reference count] */
+  {
+    GNUNET_PEER_Id ids[] = {1, 2, 3};
+    GNUNET_PEER_decrement_rcs(ids, 3);
+  }
+  
+  /* re-referencing the first 3 peers using the change_rc function */
+  for (i = 0; i < 3; i++) {
+    GNUNET_PEER_change_rc(i, 1);
+  }
+  
+  /* Removing the second Peer from the PeerEntry hash map */
+  GNUNET_PEER_change_rc(2, -2);
+  
+  /* convert the pid of the first PeerEntry into that of the third */
+  GNUNET_PEER_resolve(1, &pidArr[3]);
 	
-	/* Removing the second Peer from the PeerEntry hash map */
-	GNUNET_PEER_change_rc(2, -2);
-	
-	/* convert the pid of the first PeerEntry into that of the third */
-	GNUNET_PEER_resolve(1, pidArr[3]);
-	
-	return 0;
+  return 0;
 }
 
+
 int main()
 {
-	int ret;
-	GNUNET_log_setup ("test-peer", "ERROR", NULL);
-	generatePeerIdList();
-	ret = check();
-	destroyPeerIdList();
-	
-	return ret;
+  GNUNET_log_setup ("test-peer", "ERROR", NULL);
+  generatePeerIdList();
+  return check();
 }
+
+/* end of test_peer.c */
-- 
cgit v1.2.3