From d7e93896db27fbc49e1dbb13b2f57b247c7b8f33 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 10 Mar 2014 10:36:14 +0000
Subject: Rename SearchMessage from regex to RegexSearchMessage so that it is
 unique in a total c-file

---
 src/regex/gnunet-service-regex.c | 8 ++++----
 src/regex/regex_api.c            | 6 +++---
 src/regex/regex_ipc.h            | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

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,
 	       struct GNUNET_SERVER_Client *client,
 	       const struct GNUNET_MessageHeader *message)
 {
-  const struct SearchMessage *sm;
+  const struct RegexSearchMessage *sm;
   const char *string;
   struct ClientEntry *ce;
   uint16_t size;
 
   size = ntohs (message->size);
-  sm = (const struct SearchMessage *) message;
+  sm = (const struct RegexSearchMessage *) message;
   string = (const char *) &sm[1];
-  if ( (size <= sizeof (struct SearchMessage)) ||
-       ('\0' != string[size - sizeof (struct SearchMessage) - 1]) )
+  if ( (size <= sizeof (struct RegexSearchMessage)) ||
+       ('\0' != string[size - sizeof (struct RegexSearchMessage) - 1]) )
   {
     GNUNET_break (0);
     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
   /**
    * Search message to transmit to the service.
    */
-  struct SearchMessage *msg;
+  struct RegexSearchMessage *msg;
 };
 
 
@@ -315,9 +315,9 @@ GNUNET_REGEX_search (const struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   s->callback = callback;
   s->callback_cls = callback_cls;
-  s->msg = GNUNET_malloc (sizeof (struct SearchMessage) + slen);
+  s->msg = GNUNET_malloc (sizeof (struct RegexSearchMessage) + slen);
   s->msg->header.type = htons (GNUNET_MESSAGE_TYPE_REGEX_SEARCH);
-  s->msg->header.size = htons (sizeof (struct SearchMessage) + slen);
+  s->msg->header.size = htons (sizeof (struct RegexSearchMessage) + slen);
   memcpy (&s->msg[1], string, slen);
   retry_search (s);
   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
 /**
  * Message to initiate regex search.
  */
-struct SearchMessage
+struct RegexSearchMessage
 {
   /**
    * Type is GNUNET_MESSAGE_TYPE_REGEX_SEARCH
-- 
cgit v1.2.3