diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-11-27 09:50:41 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-11-27 09:50:41 +0000 |
commit | 44bb721ef043f99e97d60231438b9e71104d99d7 (patch) | |
tree | 476330cbfe2031fa3e3daecf8bf3c45a5156b800 /src/set/gnunet-set-profiler.c | |
parent | bf716069e987193e1ee0d06bbc4af245e6ffa821 (diff) | |
download | gnunet-44bb721ef043f99e97d60231438b9e71104d99d7.tar.gz gnunet-44bb721ef043f99e97d60231438b9e71104d99d7.zip |
eliminating useless salt argument, salt can be generated inside of gnunet-service-set
Diffstat (limited to 'src/set/gnunet-set-profiler.c')
-rw-r--r-- | src/set/gnunet-set-profiler.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index f6fdc25cf..f1b7b4b14 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c | |||
@@ -35,8 +35,6 @@ static unsigned int num_a = 5; | |||
35 | static unsigned int num_b = 5; | 35 | static unsigned int num_b = 5; |
36 | static unsigned int num_c = 20; | 36 | static unsigned int num_c = 20; |
37 | 37 | ||
38 | static unsigned int salt = 42; | ||
39 | |||
40 | static char *op_str = "union"; | 38 | static char *op_str = "union"; |
41 | 39 | ||
42 | const static struct GNUNET_CONFIGURATION_Handle *config; | 40 | const static struct GNUNET_CONFIGURATION_Handle *config; |
@@ -51,13 +49,13 @@ struct SetInfo | |||
51 | int done; | 49 | int done; |
52 | } info1, info2; | 50 | } info1, info2; |
53 | 51 | ||
54 | struct GNUNET_CONTAINER_MultiHashMap *common_sent; | 52 | static struct GNUNET_CONTAINER_MultiHashMap *common_sent; |
55 | 53 | ||
56 | struct GNUNET_HashCode app_id; | 54 | static struct GNUNET_HashCode app_id; |
57 | 55 | ||
58 | struct GNUNET_PeerIdentity local_peer; | 56 | static struct GNUNET_PeerIdentity local_peer; |
59 | 57 | ||
60 | struct GNUNET_SET_ListenHandle *set_listener; | 58 | static struct GNUNET_SET_ListenHandle *set_listener; |
61 | 59 | ||
62 | 60 | ||
63 | static int | 61 | static int |
@@ -77,6 +75,7 @@ map_remove_iterator (void *cls, | |||
77 | 75 | ||
78 | } | 76 | } |
79 | 77 | ||
78 | |||
80 | static void | 79 | static void |
81 | check_all_done (void) | 80 | check_all_done (void) |
82 | { | 81 | { |
@@ -270,8 +269,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
270 | set_listener = GNUNET_SET_listen (config, GNUNET_SET_OPERATION_UNION, | 269 | set_listener = GNUNET_SET_listen (config, GNUNET_SET_OPERATION_UNION, |
271 | &app_id, set_listen_cb, NULL); | 270 | &app_id, set_listen_cb, NULL); |
272 | 271 | ||
273 | info1.oh = GNUNET_SET_prepare (&local_peer, &app_id, NULL, salt, GNUNET_SET_RESULT_ADDED, | 272 | info1.oh = GNUNET_SET_prepare (&local_peer, &app_id, NULL, |
274 | set_result_cb, &info1); | 273 | GNUNET_SET_RESULT_ADDED, |
274 | set_result_cb, &info1); | ||
275 | GNUNET_SET_commit (info1.oh, info1.set); | 275 | GNUNET_SET_commit (info1.oh, info1.set); |
276 | GNUNET_SET_destroy (info1.set); | 276 | GNUNET_SET_destroy (info1.set); |
277 | info1.set = NULL; | 277 | info1.set = NULL; |