[GNUnet-SVN] r32604 - gnunet/src/regex

[gnunet]

Author: florian
Date: 2014-03-10 11:36:14 +0100 (Mon, 10 Mar 2014)
New Revision: 32604

Modified:
   gnunet/src/regex/gnunet-service-regex.c
   gnunet/src/regex/regex_api.c
   gnunet/src/regex/regex_ipc.h
Log:
Rename SearchMessage from regex to RegexSearchMessage so that it is unique in a 
total c-file

Modified: gnunet/src/regex/gnunet-service-regex.c
===================================================================
--- gnunet/src/regex/gnunet-service-regex.c     2014-03-10 09:52:46 UTC (rev 
32603)
+++ gnunet/src/regex/gnunet-service-regex.c     2014-03-10 10:36:14 UTC (rev 
32604)
@@ -308,16 +308,16 @@
               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);

Modified: gnunet/src/regex/regex_api.c
===================================================================
--- gnunet/src/regex/regex_api.c        2014-03-10 09:52:46 UTC (rev 32603)
+++ gnunet/src/regex/regex_api.c        2014-03-10 10:36:14 UTC (rev 32604)
@@ -193,7 +193,7 @@
   /**
    * Search message to transmit to the service.
    */
-  struct SearchMessage *msg;
+  struct RegexSearchMessage *msg;
 };
 
 
@@ -315,9 +315,9 @@
   }
   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;

Modified: gnunet/src/regex/regex_ipc.h
===================================================================
--- gnunet/src/regex/regex_ipc.h        2014-03-10 09:52:46 UTC (rev 32603)
+++ gnunet/src/regex/regex_ipc.h        2014-03-10 10:36:14 UTC (rev 32604)
@@ -61,7 +61,7 @@
 /**
  * Message to initiate regex search.
  */
-struct SearchMessage
+struct RegexSearchMessage
 {
   /**
    * Type is GNUNET_MESSAGE_TYPE_REGEX_SEARCH