1 files changed, 76 insertions, 75 deletions
diff --git a/src/rps/test_service_rps_custommap.c b/src/rps/test_service_rps_custommap.c
index 796c46d30..6f6f6b0d3 100644
--- a/src/rps/test_service_rps_custommap.c
+++ b/src/rps/test_service_rps_custommap.c
@@ -24,102 +24,103 @@
 #include <platform.h>
 #include "gnunet-service-rps_custommap.h"
-#define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); if (NULL != c_m) CustomPeerMap_destroy (c_m); return 1; }
+#define ABORT() { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \
-#define CHECK(c) { if (!(c)) ABORT (); }
+                  if (NULL != c_m) CustomPeerMap_destroy (c_m); return 1; }
+#define CHECK(c) { if (! (c)) ABORT (); }
 static int
-check()
+check ()
 {
  struct CustomPeerMap *c_m;
  struct GNUNET_PeerIdentity k1;
  struct GNUNET_PeerIdentity k2;
  int j;
-  CHECK(NULL != (c_m = CustomPeerMap_create(4)));
+  CHECK (NULL != (c_m = CustomPeerMap_create (4)));
-  memset(&k1, 0, sizeof(k1));
+  memset (&k1, 0, sizeof(k1));
-  memset(&k2, 1, sizeof(k2));
+  memset (&k2, 1, sizeof(k2));
-  CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));
+  CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));
-  CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k2));
+  CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k2));
-  CHECK(GNUNET_NO == CustomPeerMap_remove_peer(c_m, &k1));
+  CHECK (GNUNET_NO == CustomPeerMap_remove_peer (c_m, &k1));
-  CHECK(GNUNET_NO == CustomPeerMap_remove_peer(c_m, &k2));
+  CHECK (GNUNET_NO == CustomPeerMap_remove_peer (c_m, &k2));
-  CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 0));
+  CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 0));
-  CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 0));
+  CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 0));
-  CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 1));
+  CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 1));
-  CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 1));
+  CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 1));
-  CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 0));
+  CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 0));
-  CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 0));
+  CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 0));
-  CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 1));
+  CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 1));
-  CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 1));
+  CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 1));
-  CustomPeerMap_clear(c_m);  /* See if assertions trigger */
+  CustomPeerMap_clear (c_m);  /* See if assertions trigger */
-  CHECK(0 == CustomPeerMap_size(c_m));
+  CHECK (0 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));
+  CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));
-  CHECK(1 == CustomPeerMap_size(c_m));
+  CHECK (1 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k1));
+  CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k1));
-  CHECK(1 == CustomPeerMap_size(c_m));
+  CHECK (1 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_YES == CustomPeerMap_contains_peer(c_m, &k1));
+  CHECK (GNUNET_YES == CustomPeerMap_contains_peer (c_m, &k1));
-  CHECK(GNUNET_OK == CustomPeerMap_remove_peer(c_m, &k1));
+  CHECK (GNUNET_OK == CustomPeerMap_remove_peer (c_m, &k1));
-  CHECK(0 == CustomPeerMap_size(c_m));
+  CHECK (0 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));
+  CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));
-  CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k2));
+  CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k2));
-  CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));
+  CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));
-  CHECK(1 == CustomPeerMap_size(c_m));
+  CHECK (1 == CustomPeerMap_size (c_m));
  for (j = 0; j < 16; j++)
-    {
+  {
-      CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k1));
+    CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k1));
-    }
+  }
-  CHECK(1 == CustomPeerMap_size(c_m));
+  CHECK (1 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k2));
+  CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k2));
-  CHECK(2 == CustomPeerMap_size(c_m));
+  CHECK (2 == CustomPeerMap_size (c_m));
  for (j = 0; j < 16; j++)
-    {
+  {
-      CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k2));
+    CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k2));
-    }
+  }
-  CHECK(2 == CustomPeerMap_size(c_m));
+  CHECK (2 == CustomPeerMap_size (c_m));
  /* iterate */
-  for (j = 0; j < CustomPeerMap_size(c_m); j++)
+  for (j = 0; j < CustomPeerMap_size (c_m); j++)
-    {
+  {
-      CHECK(NULL != CustomPeerMap_get_peer_by_index(c_m, j));
+    CHECK (NULL != CustomPeerMap_get_peer_by_index (c_m, j));
-    }
+  }
-  CHECK((0 == memcmp(CustomPeerMap_get_peer_by_index(c_m, 0),
+  CHECK ((0 == memcmp (CustomPeerMap_get_peer_by_index (c_m, 0),
-                     &k1, sizeof(k1))));
+                       &k1, sizeof(k1))));
-  CHECK((0 == memcmp(CustomPeerMap_get_peer_by_index(c_m, 1),
+  CHECK ((0 == memcmp (CustomPeerMap_get_peer_by_index (c_m, 1),
-                     &k2, sizeof(k2))));
+                       &k2, sizeof(k2))));
-  CHECK(GNUNET_OK == CustomPeerMap_remove_peer(c_m, &k1));
+  CHECK (GNUNET_OK == CustomPeerMap_remove_peer (c_m, &k1));
-  CHECK(1 == CustomPeerMap_size(c_m));
+  CHECK (1 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));
+  CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));
-  CHECK(GNUNET_YES == CustomPeerMap_contains_peer(c_m, &k2));
+  CHECK (GNUNET_YES == CustomPeerMap_contains_peer (c_m, &k2));
-  CHECK(NULL != CustomPeerMap_get_peer_by_index(c_m, 0));
+  CHECK (NULL != CustomPeerMap_get_peer_by_index (c_m, 0));
-  CustomPeerMap_clear(c_m);
+  CustomPeerMap_clear (c_m);
-  CHECK(0 == CustomPeerMap_size(c_m));
+  CHECK (0 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));
+  CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));
-  CHECK(1 == CustomPeerMap_size(c_m));
+  CHECK (1 == CustomPeerMap_size (c_m));
-  CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k2));
+  CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k2));
-  CHECK(2 == CustomPeerMap_size(c_m));
+  CHECK (2 == CustomPeerMap_size (c_m));
-  CustomPeerMap_clear(c_m);
+  CustomPeerMap_clear (c_m);
-  CHECK(0 == CustomPeerMap_size(c_m));
+  CHECK (0 == CustomPeerMap_size (c_m));
-  CustomPeerMap_destroy(c_m);
+  CustomPeerMap_destroy (c_m);
  return 0;
 }
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
-  (void)argc;
+  (void) argc;
-  (void)argv;
+  (void) argv;
-  GNUNET_log_setup("test_service_rps_peers",
+  GNUNET_log_setup ("test_service_rps_peers",
-                   "WARNING",
+                    "WARNING",
-                   NULL);
+                    NULL);
-  return check();
+  return check ();
 }
 /* end of test_service_rps_custommap.c */

diff --git a/src/rps/test_service_rps_custommap.c b/src/rps/test_service_rps_custommap.c index 796c46d30..6f6f6b0d3 100644 --- a/src/rps/test_service_rps_custommap.c +++ b/src/rps/test_service_rps_custommap.c
@@ -24,102 +24,103 @@
24	#include <platform.h>	24	#include <platform.h>
25	#include "gnunet-service-rps_custommap.h"	25	#include "gnunet-service-rps_custommap.h"
26		26
27	#define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); if (NULL != c_m) CustomPeerMap_destroy (c_m); return 1; }	27	#define ABORT() { fprintf (stderr, "Error at %s:%d\n", __FILE__, __LINE__); \
28	#define CHECK(c) { if (!(c)) ABORT (); }	28	if (NULL != c_m) CustomPeerMap_destroy (c_m); return 1; }
		29	#define CHECK(c) { if (! (c)) ABORT (); }
29		30
30		31
31	static int	32	static int
32	check()	33	check ()
33	{	34	{
34	struct CustomPeerMap *c_m;	35	struct CustomPeerMap *c_m;
35	struct GNUNET_PeerIdentity k1;	36	struct GNUNET_PeerIdentity k1;
36	struct GNUNET_PeerIdentity k2;	37	struct GNUNET_PeerIdentity k2;
37	int j;	38	int j;
38		39
39	CHECK(NULL != (c_m = CustomPeerMap_create(4)));	40	CHECK (NULL != (c_m = CustomPeerMap_create (4)));
40	memset(&k1, 0, sizeof(k1));	41	memset (&k1, 0, sizeof(k1));
41	memset(&k2, 1, sizeof(k2));	42	memset (&k2, 1, sizeof(k2));
42	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));	43	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));
43	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k2));	44	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k2));
44	CHECK(GNUNET_NO == CustomPeerMap_remove_peer(c_m, &k1));	45	CHECK (GNUNET_NO == CustomPeerMap_remove_peer (c_m, &k1));
45	CHECK(GNUNET_NO == CustomPeerMap_remove_peer(c_m, &k2));	46	CHECK (GNUNET_NO == CustomPeerMap_remove_peer (c_m, &k2));
46	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 0));	47	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 0));
47	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 0));	48	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 0));
48	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 1));	49	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 1));
49	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 1));	50	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 1));
50	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 0));	51	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 0));
51	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 0));	52	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 0));
52	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 1));	53	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 1));
53	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 1));	54	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 1));
54	CustomPeerMap_clear(c_m); /* See if assertions trigger */	55	CustomPeerMap_clear (c_m); /* See if assertions trigger */
55	CHECK(0 == CustomPeerMap_size(c_m));	56	CHECK (0 == CustomPeerMap_size (c_m));
56		57
57	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));	58	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));
58	CHECK(1 == CustomPeerMap_size(c_m));	59	CHECK (1 == CustomPeerMap_size (c_m));
59	CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k1));	60	CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k1));
60	CHECK(1 == CustomPeerMap_size(c_m));	61	CHECK (1 == CustomPeerMap_size (c_m));
61	CHECK(GNUNET_YES == CustomPeerMap_contains_peer(c_m, &k1));	62	CHECK (GNUNET_YES == CustomPeerMap_contains_peer (c_m, &k1));
62	CHECK(GNUNET_OK == CustomPeerMap_remove_peer(c_m, &k1));	63	CHECK (GNUNET_OK == CustomPeerMap_remove_peer (c_m, &k1));
63	CHECK(0 == CustomPeerMap_size(c_m));	64	CHECK (0 == CustomPeerMap_size (c_m));
64	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));	65	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));
65	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k2));	66	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k2));
66		67
67	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));	68	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));
68	CHECK(1 == CustomPeerMap_size(c_m));	69	CHECK (1 == CustomPeerMap_size (c_m));
69	for (j = 0; j < 16; j++)	70	for (j = 0; j < 16; j++)
70	{	71	{
71	CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k1));	72	CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k1));
72	}	73	}
73	CHECK(1 == CustomPeerMap_size(c_m));	74	CHECK (1 == CustomPeerMap_size (c_m));
74	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k2));	75	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k2));
75	CHECK(2 == CustomPeerMap_size(c_m));	76	CHECK (2 == CustomPeerMap_size (c_m));
76	for (j = 0; j < 16; j++)	77	for (j = 0; j < 16; j++)
77	{	78	{
78	CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k2));	79	CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k2));
79	}	80	}
80	CHECK(2 == CustomPeerMap_size(c_m));	81	CHECK (2 == CustomPeerMap_size (c_m));
81		82
82	/* iterate */	83	/* iterate */
83	for (j = 0; j < CustomPeerMap_size(c_m); j++)	84	for (j = 0; j < CustomPeerMap_size (c_m); j++)
84	{	85	{
85	CHECK(NULL != CustomPeerMap_get_peer_by_index(c_m, j));	86	CHECK (NULL != CustomPeerMap_get_peer_by_index (c_m, j));
86	}	87	}
87	CHECK((0 == memcmp(CustomPeerMap_get_peer_by_index(c_m, 0),	88	CHECK ((0 == memcmp (CustomPeerMap_get_peer_by_index (c_m, 0),
88	&k1, sizeof(k1))));	89	&k1, sizeof(k1))));
89	CHECK((0 == memcmp(CustomPeerMap_get_peer_by_index(c_m, 1),	90	CHECK ((0 == memcmp (CustomPeerMap_get_peer_by_index (c_m, 1),
90	&k2, sizeof(k2))));	91	&k2, sizeof(k2))));
91	CHECK(GNUNET_OK == CustomPeerMap_remove_peer(c_m, &k1));	92	CHECK (GNUNET_OK == CustomPeerMap_remove_peer (c_m, &k1));
92	CHECK(1 == CustomPeerMap_size(c_m));	93	CHECK (1 == CustomPeerMap_size (c_m));
93	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));	94	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));
94	CHECK(GNUNET_YES == CustomPeerMap_contains_peer(c_m, &k2));	95	CHECK (GNUNET_YES == CustomPeerMap_contains_peer (c_m, &k2));
95	CHECK(NULL != CustomPeerMap_get_peer_by_index(c_m, 0));	96	CHECK (NULL != CustomPeerMap_get_peer_by_index (c_m, 0));
96		97
97	CustomPeerMap_clear(c_m);	98	CustomPeerMap_clear (c_m);
98	CHECK(0 == CustomPeerMap_size(c_m));	99	CHECK (0 == CustomPeerMap_size (c_m));
99		100
100	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));	101	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));
101	CHECK(1 == CustomPeerMap_size(c_m));	102	CHECK (1 == CustomPeerMap_size (c_m));
102	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k2));	103	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k2));
103	CHECK(2 == CustomPeerMap_size(c_m));	104	CHECK (2 == CustomPeerMap_size (c_m));
104	CustomPeerMap_clear(c_m);	105	CustomPeerMap_clear (c_m);
105	CHECK(0 == CustomPeerMap_size(c_m));	106	CHECK (0 == CustomPeerMap_size (c_m));
106		107
107	CustomPeerMap_destroy(c_m);	108	CustomPeerMap_destroy (c_m);
108		109
109	return 0;	110	return 0;
110	}	111	}
111		112
112		113
113	int	114	int
114	main(int argc, char *argv[])	115	main (int argc, char *argv[])
115	{	116	{
116	(void)argc;	117	(void) argc;
117	(void)argv;	118	(void) argv;
118		119
119	GNUNET_log_setup("test_service_rps_peers",	120	GNUNET_log_setup ("test_service_rps_peers",
120	"WARNING",	121	"WARNING",
121	NULL);	122	NULL);
122	return check();	123	return check ();
123	}	124	}
124		125
125	/* end of test_service_rps_custommap.c */	126	/* end of test_service_rps_custommap.c */