1 files changed, 76 insertions, 77 deletions
diff --git a/src/rps/test_service_rps_custommap.c b/src/rps/test_service_rps_custommap.c
index d2061d4ec..796c46d30 100644
--- a/src/rps/test_service_rps_custommap.c
+++ b/src/rps/test_service_rps_custommap.c
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
     SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
 * @file rps/test_service_rps_custommap.c
 * @brief testcase for gnunet-service-rps_peers.c
@@ -24,103 +24,102 @@
 #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__); if (NULL != c_m) CustomPeerMap_destroy (c_m); return 1; }
-#define CHECK(c) { if (! (c)) ABORT(); }
+#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 d2061d4ec..796c46d30 100644 --- a/src/rps/test_service_rps_custommap.c +++ b/src/rps/test_service_rps_custommap.c
@@ -16,7 +16,7 @@
16	along with this program. If not, see <http://www.gnu.org/licenses/>.	16	along with this program. If not, see <http://www.gnu.org/licenses/>.
17		17
18	SPDX-License-Identifier: AGPL3.0-or-later	18	SPDX-License-Identifier: AGPL3.0-or-later
19	*/	19	*/
20	/**	20	/**
21	* @file rps/test_service_rps_custommap.c	21	* @file rps/test_service_rps_custommap.c
22	* @brief testcase for gnunet-service-rps_peers.c	22	* @brief testcase for gnunet-service-rps_peers.c
@@ -24,103 +24,102 @@
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__); if (NULL != c_m) CustomPeerMap_destroy (c_m); return 1; }
28	#define CHECK(c) { if (! (c)) ABORT(); }	28	#define CHECK(c) { if (!(c)) ABORT (); }
29		29
30		30
31	static int	31	static int
32	check ()	32	check()
33	{	33	{
34
35	struct CustomPeerMap *c_m;	34	struct CustomPeerMap *c_m;
36	struct GNUNET_PeerIdentity k1;	35	struct GNUNET_PeerIdentity k1;
37	struct GNUNET_PeerIdentity k2;	36	struct GNUNET_PeerIdentity k2;
38	int j;	37	int j;
39		38
40	CHECK (NULL != (c_m = CustomPeerMap_create (4)));	39	CHECK(NULL != (c_m = CustomPeerMap_create(4)));
41	memset (&k1, 0, sizeof (k1));	40	memset(&k1, 0, sizeof(k1));
42	memset (&k2, 1, sizeof (k2));	41	memset(&k2, 1, sizeof(k2));
43	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));	42	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));
44	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k2));	43	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k2));
45	CHECK (GNUNET_NO == CustomPeerMap_remove_peer (c_m, &k1));	44	CHECK(GNUNET_NO == CustomPeerMap_remove_peer(c_m, &k1));
46	CHECK (GNUNET_NO == CustomPeerMap_remove_peer (c_m, &k2));	45	CHECK(GNUNET_NO == CustomPeerMap_remove_peer(c_m, &k2));
47	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 0));	46	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 0));
48	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 0));	47	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 0));
49	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 1));	48	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 1));
50	CHECK (GNUNET_NO == CustomPeerMap_remove_peer_by_index (c_m, 1));	49	CHECK(GNUNET_NO == CustomPeerMap_remove_peer_by_index(c_m, 1));
51	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 0));	50	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 0));
52	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 0));	51	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 0));
53	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 1));	52	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 1));
54	CHECK (NULL == CustomPeerMap_get_peer_by_index (c_m, 1));	53	CHECK(NULL == CustomPeerMap_get_peer_by_index(c_m, 1));
55	CustomPeerMap_clear (c_m); /* See if assertions trigger */	54	CustomPeerMap_clear(c_m); /* See if assertions trigger */
56	CHECK (0 == CustomPeerMap_size (c_m));	55	CHECK(0 == CustomPeerMap_size(c_m));
57		56
58	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));	57	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));
59	CHECK (1 == CustomPeerMap_size (c_m));	58	CHECK(1 == CustomPeerMap_size(c_m));
60	CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k1));	59	CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k1));
61	CHECK (1 == CustomPeerMap_size (c_m));	60	CHECK(1 == CustomPeerMap_size(c_m));
62	CHECK (GNUNET_YES == CustomPeerMap_contains_peer (c_m, &k1));	61	CHECK(GNUNET_YES == CustomPeerMap_contains_peer(c_m, &k1));
63	CHECK (GNUNET_OK == CustomPeerMap_remove_peer (c_m, &k1));	62	CHECK(GNUNET_OK == CustomPeerMap_remove_peer(c_m, &k1));
64	CHECK (0 == CustomPeerMap_size (c_m));	63	CHECK(0 == CustomPeerMap_size(c_m));
65	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));	64	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));
66	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k2));	65	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k2));
67		66
68	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));	67	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));
69	CHECK (1 == CustomPeerMap_size (c_m));	68	CHECK(1 == CustomPeerMap_size(c_m));
70	for (j = 0; j < 16; j++)	69	for (j = 0; j < 16; j++)
71	{	70	{
72	CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k1));	71	CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k1));
73	}	72	}
74	CHECK (1 == CustomPeerMap_size (c_m));	73	CHECK(1 == CustomPeerMap_size(c_m));
75	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k2));	74	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k2));
76	CHECK (2 == CustomPeerMap_size (c_m));	75	CHECK(2 == CustomPeerMap_size(c_m));
77	for (j = 0; j < 16; j++)	76	for (j = 0; j < 16; j++)
78	{	77	{
79	CHECK (GNUNET_NO == CustomPeerMap_put (c_m, &k2));	78	CHECK(GNUNET_NO == CustomPeerMap_put(c_m, &k2));
80	}	79	}
81	CHECK (2 == CustomPeerMap_size (c_m));	80	CHECK(2 == CustomPeerMap_size(c_m));
82		81
83	/* iterate */	82	/* iterate */
84	for (j = 0; j < CustomPeerMap_size (c_m); j++)	83	for (j = 0; j < CustomPeerMap_size(c_m); j++)
85	{	84	{
86	CHECK (NULL != CustomPeerMap_get_peer_by_index (c_m, j));	85	CHECK(NULL != CustomPeerMap_get_peer_by_index(c_m, j));
87	}	86	}
88	CHECK ((0 == memcmp (CustomPeerMap_get_peer_by_index (c_m, 0),	87	CHECK((0 == memcmp(CustomPeerMap_get_peer_by_index(c_m, 0),
89	&k1, sizeof (k1))));	88	&k1, sizeof(k1))));
90	CHECK ((0 == memcmp (CustomPeerMap_get_peer_by_index (c_m, 1),	89	CHECK((0 == memcmp(CustomPeerMap_get_peer_by_index(c_m, 1),
91	&k2, sizeof (k2))));	90	&k2, sizeof(k2))));
92	CHECK (GNUNET_OK == CustomPeerMap_remove_peer (c_m, &k1));	91	CHECK(GNUNET_OK == CustomPeerMap_remove_peer(c_m, &k1));
93	CHECK (1 == CustomPeerMap_size (c_m));	92	CHECK(1 == CustomPeerMap_size(c_m));
94	CHECK (GNUNET_NO == CustomPeerMap_contains_peer (c_m, &k1));	93	CHECK(GNUNET_NO == CustomPeerMap_contains_peer(c_m, &k1));
95	CHECK (GNUNET_YES == CustomPeerMap_contains_peer (c_m, &k2));	94	CHECK(GNUNET_YES == CustomPeerMap_contains_peer(c_m, &k2));
96	CHECK (NULL != CustomPeerMap_get_peer_by_index (c_m, 0));	95	CHECK(NULL != CustomPeerMap_get_peer_by_index(c_m, 0));
97		96
98	CustomPeerMap_clear (c_m);	97	CustomPeerMap_clear(c_m);
99	CHECK (0 == CustomPeerMap_size (c_m));	98	CHECK(0 == CustomPeerMap_size(c_m));
100		99
101	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k1));	100	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k1));
102	CHECK (1 == CustomPeerMap_size (c_m));	101	CHECK(1 == CustomPeerMap_size(c_m));
103	CHECK (GNUNET_OK == CustomPeerMap_put (c_m, &k2));	102	CHECK(GNUNET_OK == CustomPeerMap_put(c_m, &k2));
104	CHECK (2 == CustomPeerMap_size (c_m));	103	CHECK(2 == CustomPeerMap_size(c_m));
105	CustomPeerMap_clear (c_m);	104	CustomPeerMap_clear(c_m);
106	CHECK (0 == CustomPeerMap_size (c_m));	105	CHECK(0 == CustomPeerMap_size(c_m));
107		106
108	CustomPeerMap_destroy (c_m);	107	CustomPeerMap_destroy(c_m);
109		108
110	return 0;	109	return 0;
111	}	110	}
112		111
113		112
114	int	113	int
115	main (int argc, char *argv[])	114	main(int argc, char *argv[])
116	{	115	{
117	(void) argc;	116	(void)argc;
118	(void) argv;	117	(void)argv;
119		118
120	GNUNET_log_setup ("test_service_rps_peers",	119	GNUNET_log_setup("test_service_rps_peers",
121	"WARNING",	120	"WARNING",
122	NULL);	121	NULL);
123	return check ();	122	return check();
124	}	123	}
125		124
126	/* end of test_service_rps_custommap.c */	125	/* end of test_service_rps_custommap.c */