diff options
author | Florian Dold <florian.dold@gmail.com> | 2014-03-10 10:36:14 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2014-03-10 10:36:14 +0000 |
commit | d7e93896db27fbc49e1dbb13b2f57b247c7b8f33 (patch) | |
tree | efcf0aeb83ee341627974abb84e33369157a031e | |
parent | aed2e25ac1b9e0ff39b3408ddb9df29bb152fa49 (diff) | |
download | gnunet-d7e93896db27fbc49e1dbb13b2f57b247c7b8f33.tar.gz gnunet-d7e93896db27fbc49e1dbb13b2f57b247c7b8f33.zip |
Rename SearchMessage from regex to RegexSearchMessage so that it is unique in a total c-file
-rw-r--r-- | src/regex/gnunet-service-regex.c | 8 | ||||
-rw-r--r-- | src/regex/regex_api.c | 6 | ||||
-rw-r--r-- | src/regex/regex_ipc.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c index cc32c46de..6daab0be3 100644 --- a/src/regex/gnunet-service-regex.c +++ b/src/regex/gnunet-service-regex.c | |||
@@ -308,16 +308,16 @@ handle_search (void *cls, | |||
308 | struct GNUNET_SERVER_Client *client, | 308 | struct GNUNET_SERVER_Client *client, |
309 | const struct GNUNET_MessageHeader *message) | 309 | const struct GNUNET_MessageHeader *message) |
310 | { | 310 | { |
311 | const struct SearchMessage *sm; | 311 | const struct RegexSearchMessage *sm; |
312 | const char *string; | 312 | const char *string; |
313 | struct ClientEntry *ce; | 313 | struct ClientEntry *ce; |
314 | uint16_t size; | 314 | uint16_t size; |
315 | 315 | ||
316 | size = ntohs (message->size); | 316 | size = ntohs (message->size); |
317 | sm = (const struct SearchMessage *) message; | 317 | sm = (const struct RegexSearchMessage *) message; |
318 | string = (const char *) &sm[1]; | 318 | string = (const char *) &sm[1]; |
319 | if ( (size <= sizeof (struct SearchMessage)) || | 319 | if ( (size <= sizeof (struct RegexSearchMessage)) || |
320 | ('\0' != string[size - sizeof (struct SearchMessage) - 1]) ) | 320 | ('\0' != string[size - sizeof (struct RegexSearchMessage) - 1]) ) |
321 | { | 321 | { |
322 | GNUNET_break (0); | 322 | GNUNET_break (0); |
323 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 323 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
diff --git a/src/regex/regex_api.c b/src/regex/regex_api.c index 979f58d47..c64d0d22e 100644 --- a/src/regex/regex_api.c +++ b/src/regex/regex_api.c | |||
@@ -193,7 +193,7 @@ struct GNUNET_REGEX_Search | |||
193 | /** | 193 | /** |
194 | * Search message to transmit to the service. | 194 | * Search message to transmit to the service. |
195 | */ | 195 | */ |
196 | struct SearchMessage *msg; | 196 | struct RegexSearchMessage *msg; |
197 | }; | 197 | }; |
198 | 198 | ||
199 | 199 | ||
@@ -315,9 +315,9 @@ GNUNET_REGEX_search (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
315 | } | 315 | } |
316 | s->callback = callback; | 316 | s->callback = callback; |
317 | s->callback_cls = callback_cls; | 317 | s->callback_cls = callback_cls; |
318 | s->msg = GNUNET_malloc (sizeof (struct SearchMessage) + slen); | 318 | s->msg = GNUNET_malloc (sizeof (struct RegexSearchMessage) + slen); |
319 | s->msg->header.type = htons (GNUNET_MESSAGE_TYPE_REGEX_SEARCH); | 319 | s->msg->header.type = htons (GNUNET_MESSAGE_TYPE_REGEX_SEARCH); |
320 | s->msg->header.size = htons (sizeof (struct SearchMessage) + slen); | 320 | s->msg->header.size = htons (sizeof (struct RegexSearchMessage) + slen); |
321 | memcpy (&s->msg[1], string, slen); | 321 | memcpy (&s->msg[1], string, slen); |
322 | retry_search (s); | 322 | retry_search (s); |
323 | return s; | 323 | return s; |
diff --git a/src/regex/regex_ipc.h b/src/regex/regex_ipc.h index ab7aa45cd..83b67f0f9 100644 --- a/src/regex/regex_ipc.h +++ b/src/regex/regex_ipc.h | |||
@@ -61,7 +61,7 @@ struct AnnounceMessage | |||
61 | /** | 61 | /** |
62 | * Message to initiate regex search. | 62 | * Message to initiate regex search. |
63 | */ | 63 | */ |
64 | struct SearchMessage | 64 | struct RegexSearchMessage |
65 | { | 65 | { |
66 | /** | 66 | /** |
67 | * Type is GNUNET_MESSAGE_TYPE_REGEX_SEARCH | 67 | * Type is GNUNET_MESSAGE_TYPE_REGEX_SEARCH |