diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-11-27 10:04:14 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-11-27 10:04:14 +0000 |
commit | 47c52147dac6bc423b43aa8e2721585df893440b (patch) | |
tree | f70838a0ad5400cc100ec948a6ccb6295a509379 /src/set | |
parent | 4d376fad783520443f21216de0eed2d8cfc43c97 (diff) | |
download | gnunet-47c52147dac6bc423b43aa8e2721585df893440b.tar.gz gnunet-47c52147dac6bc423b43aa8e2721585df893440b.zip |
rename element's type field to 'element_type'
Diffstat (limited to 'src/set')
-rw-r--r-- | src/set/gnunet-service-set.c | 2 | ||||
-rw-r--r-- | src/set/gnunet-service-set_intersection.c | 4 | ||||
-rw-r--r-- | src/set/gnunet-service-set_union.c | 4 | ||||
-rw-r--r-- | src/set/gnunet-set-profiler.c | 13 | ||||
-rw-r--r-- | src/set/set_api.c | 12 | ||||
-rw-r--r-- | src/set/test_set_api.c | 6 | ||||
-rw-r--r-- | src/set/test_set_intersection_result_full.c | 6 | ||||
-rw-r--r-- | src/set/test_set_union_result_full.c | 6 |
8 files changed, 28 insertions, 25 deletions
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 452ded8a3..b050cb465 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c | |||
@@ -694,7 +694,7 @@ send_client_element (struct Set *set) | |||
694 | ee->element.size, | 694 | ee->element.size, |
695 | GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT); | 695 | GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT); |
696 | memcpy (&msg[1], ee->element.data, ee->element.size); | 696 | memcpy (&msg[1], ee->element.data, ee->element.size); |
697 | msg->element_type = ee->element.type; | 697 | msg->element_type = ee->element.element_type; |
698 | } | 698 | } |
699 | GNUNET_MQ_send (set->client_mq, ev); | 699 | GNUNET_MQ_send (set->client_mq, ev); |
700 | } | 700 | } |
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c index 606776154..4a252f4be 100644 --- a/src/set/gnunet-service-set_intersection.c +++ b/src/set/gnunet-service-set_intersection.c | |||
@@ -181,7 +181,7 @@ send_client_element (struct Operation *op, | |||
181 | } | 181 | } |
182 | rm->result_status = htons (GNUNET_SET_STATUS_OK); | 182 | rm->result_status = htons (GNUNET_SET_STATUS_OK); |
183 | rm->request_id = htonl (op->spec->client_request_id); | 183 | rm->request_id = htonl (op->spec->client_request_id); |
184 | rm->element_type = element->type; | 184 | rm->element_type = element->element_type; |
185 | memcpy (&rm[1], element->data, element->size); | 185 | memcpy (&rm[1], element->data, element->size); |
186 | GNUNET_MQ_send (op->spec->set->client_mq, ev); | 186 | GNUNET_MQ_send (op->spec->set->client_mq, ev); |
187 | } | 187 | } |
@@ -572,7 +572,7 @@ send_remaining_elements (void *cls) | |||
572 | 572 | ||
573 | rm->result_status = htons (GNUNET_SET_STATUS_OK); | 573 | rm->result_status = htons (GNUNET_SET_STATUS_OK); |
574 | rm->request_id = htonl (op->spec->client_request_id); | 574 | rm->request_id = htonl (op->spec->client_request_id); |
575 | rm->element_type = element->type; | 575 | rm->element_type = element->element_type; |
576 | memcpy (&rm[1], element->data, element->size); | 576 | memcpy (&rm[1], element->data, element->size); |
577 | 577 | ||
578 | GNUNET_MQ_notify_sent (ev, send_remaining_elements, op); | 578 | GNUNET_MQ_notify_sent (ev, send_remaining_elements, op); |
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 77e8502d6..10ad1c545 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c | |||
@@ -965,7 +965,7 @@ send_client_element (struct Operation *op, | |||
965 | } | 965 | } |
966 | rm->result_status = htons (GNUNET_SET_STATUS_OK); | 966 | rm->result_status = htons (GNUNET_SET_STATUS_OK); |
967 | rm->request_id = htonl (op->spec->client_request_id); | 967 | rm->request_id = htonl (op->spec->client_request_id); |
968 | rm->element_type = element->type; | 968 | rm->element_type = element->element_type; |
969 | memcpy (&rm[1], element->data, element->size); | 969 | memcpy (&rm[1], element->data, element->size); |
970 | GNUNET_MQ_send (op->spec->set->client_mq, ev); | 970 | GNUNET_MQ_send (op->spec->set->client_mq, ev); |
971 | } | 971 | } |
@@ -1036,7 +1036,7 @@ send_remaining_elements (void *cls) | |||
1036 | } | 1036 | } |
1037 | rm->result_status = htons (GNUNET_SET_STATUS_OK); | 1037 | rm->result_status = htons (GNUNET_SET_STATUS_OK); |
1038 | rm->request_id = htonl (op->spec->client_request_id); | 1038 | rm->request_id = htonl (op->spec->client_request_id); |
1039 | rm->element_type = element->type; | 1039 | rm->element_type = element->element_type; |
1040 | memcpy (&rm[1], element->data, element->size); | 1040 | memcpy (&rm[1], element->data, element->size); |
1041 | if (ke->next_colliding == NULL) | 1041 | if (ke->next_colliding == NULL) |
1042 | { | 1042 | { |
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index f1b7b4b14..3bff45254 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c | |||
@@ -143,18 +143,19 @@ set_listen_cb (void *cls, | |||
143 | { | 143 | { |
144 | if (NULL == request) | 144 | if (NULL == request) |
145 | { | 145 | { |
146 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "listener failed\n"); | 146 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
147 | "listener failed\n"); | ||
147 | return; | 148 | return; |
148 | } | 149 | } |
149 | GNUNET_assert (NULL == info2.oh); | 150 | GNUNET_assert (NULL == info2.oh); |
150 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set listen cb called\n"); | 151 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
152 | "set listen cb called\n"); | ||
151 | info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED, | 153 | info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED, |
152 | set_result_cb, &info2); | 154 | set_result_cb, &info2); |
153 | GNUNET_SET_commit (info2.oh, info2.set); | 155 | GNUNET_SET_commit (info2.oh, info2.set); |
154 | } | 156 | } |
155 | 157 | ||
156 | 158 | ||
157 | |||
158 | static int | 159 | static int |
159 | set_insert_iterator (void *cls, | 160 | set_insert_iterator (void *cls, |
160 | const struct GNUNET_HashCode *key, | 161 | const struct GNUNET_HashCode *key, |
@@ -163,8 +164,9 @@ set_insert_iterator (void *cls, | |||
163 | struct GNUNET_SET_Handle *set = cls; | 164 | struct GNUNET_SET_Handle *set = cls; |
164 | struct GNUNET_SET_Element *el; | 165 | struct GNUNET_SET_Element *el; |
165 | 166 | ||
166 | el = GNUNET_malloc (sizeof *el + sizeof *key); | 167 | el = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + |
167 | el->type = 0; | 168 | sizeof (struct GNUNET_HashCode)); |
169 | el->element_type = 0; | ||
168 | memcpy (&el[1], key, sizeof *key); | 170 | memcpy (&el[1], key, sizeof *key); |
169 | el->data = &el[1]; | 171 | el->data = &el[1]; |
170 | el->size = sizeof *key; | 172 | el->size = sizeof *key; |
@@ -205,6 +207,7 @@ handle_shutdown (void *cls, | |||
205 | } | 207 | } |
206 | } | 208 | } |
207 | 209 | ||
210 | |||
208 | static void | 211 | static void |
209 | run (void *cls, char *const *args, const char *cfgfile, | 212 | run (void *cls, char *const *args, const char *cfgfile, |
210 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 213 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
diff --git a/src/set/set_api.c b/src/set/set_api.c index 10421ebda..1ef0cc50c 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c | |||
@@ -234,7 +234,7 @@ handle_iter_element (void *cls, const struct GNUNET_MessageHeader *mh) | |||
234 | return; | 234 | return; |
235 | 235 | ||
236 | element.size = ntohs (mh->size) - sizeof (struct GNUNET_SET_IterResponseMessage); | 236 | element.size = ntohs (mh->size) - sizeof (struct GNUNET_SET_IterResponseMessage); |
237 | element.type = htons (msg->element_type); | 237 | element.element_type = htons (msg->element_type); |
238 | element.data = &msg[1]; | 238 | element.data = &msg[1]; |
239 | set->iterator (set->iterator_cls, &element); | 239 | set->iterator (set->iterator_cls, &element); |
240 | ev = GNUNET_MQ_msg (ack_msg, GNUNET_MESSAGE_TYPE_SET_ITER_ACK); | 240 | ev = GNUNET_MQ_msg (ack_msg, GNUNET_MESSAGE_TYPE_SET_ITER_ACK); |
@@ -306,7 +306,7 @@ handle_result (void *cls, const struct GNUNET_MessageHeader *mh) | |||
306 | 306 | ||
307 | e.data = &msg[1]; | 307 | e.data = &msg[1]; |
308 | e.size = ntohs (mh->size) - sizeof (struct GNUNET_SET_ResultMessage); | 308 | e.size = ntohs (mh->size) - sizeof (struct GNUNET_SET_ResultMessage); |
309 | e.type = msg->element_type; | 309 | e.element_type = msg->element_type; |
310 | if (NULL != oh->result_cb) | 310 | if (NULL != oh->result_cb) |
311 | oh->result_cb (oh->result_cls, &e, result_status); | 311 | oh->result_cb (oh->result_cls, &e, result_status); |
312 | } | 312 | } |
@@ -552,7 +552,7 @@ GNUNET_SET_add_element (struct GNUNET_SET_Handle *set, | |||
552 | } | 552 | } |
553 | 553 | ||
554 | mqm = GNUNET_MQ_msg_extra (msg, element->size, GNUNET_MESSAGE_TYPE_SET_ADD); | 554 | mqm = GNUNET_MQ_msg_extra (msg, element->size, GNUNET_MESSAGE_TYPE_SET_ADD); |
555 | msg->element_type = element->type; | 555 | msg->element_type = element->element_type; |
556 | memcpy (&msg[1], element->data, element->size); | 556 | memcpy (&msg[1], element->data, element->size); |
557 | GNUNET_MQ_notify_sent (mqm, cont, cont_cls); | 557 | GNUNET_MQ_notify_sent (mqm, cont, cont_cls); |
558 | GNUNET_MQ_send (set->mq, mqm); | 558 | GNUNET_MQ_send (set->mq, mqm); |
@@ -569,8 +569,8 @@ GNUNET_SET_add_element (struct GNUNET_SET_Handle *set, | |||
569 | * @param set set to remove element from | 569 | * @param set set to remove element from |
570 | * @param element element to remove from the set | 570 | * @param element element to remove from the set |
571 | * @param cont continuation called after the element has been removed | 571 | * @param cont continuation called after the element has been removed |
572 | * @param cont_cls closure for cont | 572 | * @param cont_cls closure for @a cont |
573 | * @return GNUNET_OK on success, GNUNET_SYSERR if the | 573 | * @return #GNUNET_OK on success, #GNUNET_SYSERR if the |
574 | * set is invalid (e.g. the set service crashed) | 574 | * set is invalid (e.g. the set service crashed) |
575 | */ | 575 | */ |
576 | int | 576 | int |
@@ -590,7 +590,7 @@ GNUNET_SET_remove_element (struct GNUNET_SET_Handle *set, | |||
590 | } | 590 | } |
591 | 591 | ||
592 | mqm = GNUNET_MQ_msg_extra (msg, element->size, GNUNET_MESSAGE_TYPE_SET_REMOVE); | 592 | mqm = GNUNET_MQ_msg_extra (msg, element->size, GNUNET_MESSAGE_TYPE_SET_REMOVE); |
593 | msg->element_type = element->type; | 593 | msg->element_type = element->element_type; |
594 | memcpy (&msg[1], element->data, element->size); | 594 | memcpy (&msg[1], element->data, element->size); |
595 | GNUNET_MQ_notify_sent (mqm, cont, cont_cls); | 595 | GNUNET_MQ_notify_sent (mqm, cont, cont_cls); |
596 | GNUNET_MQ_send (set->mq, mqm); | 596 | GNUNET_MQ_send (set->mq, mqm); |
diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c index 63188eb60..37645cbd8 100644 --- a/src/set/test_set_api.c +++ b/src/set/test_set_api.c | |||
@@ -149,7 +149,7 @@ init_set2 (void *cls) | |||
149 | 149 | ||
150 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); | 150 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); |
151 | 151 | ||
152 | element.type = 0; | 152 | element.element_type = 0; |
153 | 153 | ||
154 | element.data = "hello"; | 154 | element.data = "hello"; |
155 | element.size = strlen(element.data); | 155 | element.size = strlen(element.data); |
@@ -171,7 +171,7 @@ init_set1 (void) | |||
171 | { | 171 | { |
172 | struct GNUNET_SET_Element element; | 172 | struct GNUNET_SET_Element element; |
173 | 173 | ||
174 | element.type = 0; | 174 | element.element_type = 0; |
175 | 175 | ||
176 | element.data = "hello"; | 176 | element.data = "hello"; |
177 | element.size = strlen(element.data); | 177 | element.size = strlen(element.data); |
@@ -208,7 +208,7 @@ test_iter () | |||
208 | 208 | ||
209 | iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_UNION); | 209 | iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_UNION); |
210 | 210 | ||
211 | element.type = 0; | 211 | element.element_type = 0; |
212 | 212 | ||
213 | element.data = "hello"; | 213 | element.data = "hello"; |
214 | element.size = strlen(element.data); | 214 | element.size = strlen(element.data); |
diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c index 3b4591bed..567a2ed0d 100644 --- a/src/set/test_set_intersection_result_full.c +++ b/src/set/test_set_intersection_result_full.c | |||
@@ -152,7 +152,7 @@ init_set2 (void *cls) | |||
152 | 152 | ||
153 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 153 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
154 | "initializing set 2\n"); | 154 | "initializing set 2\n"); |
155 | element.type = 0; | 155 | element.element_type = 0; |
156 | element.data = "hello"; | 156 | element.data = "hello"; |
157 | element.size = strlen(element.data); | 157 | element.size = strlen(element.data); |
158 | GNUNET_SET_add_element (set2, &element, NULL, NULL); | 158 | GNUNET_SET_add_element (set2, &element, NULL, NULL); |
@@ -173,7 +173,7 @@ init_set1 (void) | |||
173 | { | 173 | { |
174 | struct GNUNET_SET_Element element; | 174 | struct GNUNET_SET_Element element; |
175 | 175 | ||
176 | element.type = 0; | 176 | element.element_type = 0; |
177 | element.data = "hello"; | 177 | element.data = "hello"; |
178 | element.size = strlen(element.data); | 178 | element.size = strlen(element.data); |
179 | GNUNET_SET_add_element (set1, &element, NULL, NULL); | 179 | GNUNET_SET_add_element (set1, &element, NULL, NULL); |
@@ -205,7 +205,7 @@ test_iter () | |||
205 | struct GNUNET_SET_Handle *iter_set; | 205 | struct GNUNET_SET_Handle *iter_set; |
206 | 206 | ||
207 | iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_INTERSECTION); | 207 | iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_INTERSECTION); |
208 | element.type = 0; | 208 | element.element_type = 0; |
209 | element.data = "hello"; | 209 | element.data = "hello"; |
210 | element.size = strlen(element.data); | 210 | element.size = strlen(element.data); |
211 | GNUNET_SET_add_element (iter_set, &element, NULL, NULL); | 211 | GNUNET_SET_add_element (iter_set, &element, NULL, NULL); |
diff --git a/src/set/test_set_union_result_full.c b/src/set/test_set_union_result_full.c index 1ed7c7bee..f3f389dd0 100644 --- a/src/set/test_set_union_result_full.c +++ b/src/set/test_set_union_result_full.c | |||
@@ -150,7 +150,7 @@ init_set2 (void *cls) | |||
150 | 150 | ||
151 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); | 151 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); |
152 | 152 | ||
153 | element.type = 0; | 153 | element.element_type = 0; |
154 | 154 | ||
155 | element.data = "hello"; | 155 | element.data = "hello"; |
156 | element.size = strlen(element.data); | 156 | element.size = strlen(element.data); |
@@ -172,7 +172,7 @@ init_set1 (void) | |||
172 | { | 172 | { |
173 | struct GNUNET_SET_Element element; | 173 | struct GNUNET_SET_Element element; |
174 | 174 | ||
175 | element.type = 0; | 175 | element.element_type = 0; |
176 | 176 | ||
177 | element.data = "hello"; | 177 | element.data = "hello"; |
178 | element.size = strlen(element.data); | 178 | element.size = strlen(element.data); |
@@ -209,7 +209,7 @@ test_iter () | |||
209 | 209 | ||
210 | iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_UNION); | 210 | iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_UNION); |
211 | 211 | ||
212 | element.type = 0; | 212 | element.element_type = 0; |
213 | 213 | ||
214 | element.data = "hello"; | 214 | element.data = "hello"; |
215 | element.size = strlen(element.data); | 215 | element.size = strlen(element.data); |