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

[gnunet]

Author: grothoff
Date: 2013-06-26 13:58:56 +0200 (Wed, 26 Jun 2013)
New Revision: 27625

Modified:
   gnunet/src/regex/regex_block_lib.c
   gnunet/src/regex/regex_internal_dht.c
Log:
-follow naming and coding style conventions

Modified: gnunet/src/regex/regex_block_lib.c
===================================================================
--- gnunet/src/regex/regex_block_lib.c  2013-06-26 11:55:44 UTC (rev 27624)
+++ gnunet/src/regex/regex_block_lib.c  2013-06-26 11:58:56 UTC (rev 27625)
@@ -31,7 +31,7 @@
 /**
  * Struct to keep track of the xquery while iterating all the edges in a block.
  */
-struct regex_block_xquery_ctx
+struct CheckEdgeContext
 {
   /**
    * Xquery: string we are looking for.
@@ -66,7 +66,7 @@
             size_t len,
             const struct GNUNET_HashCode *key)
 {
-  struct regex_block_xquery_ctx *ctx = cls;
+  struct CheckEdgeContext *ctx = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
              "edge %.*s [%u]: %s->%s\n",
@@ -98,9 +98,10 @@
                   size_t size,
                   const char *xquery)
 {
+  struct CheckEdgeContext ctx;
   int res;
-  struct regex_block_xquery_ctx ctx;
 
+  // FIXME: fails to check the proof!
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Checking block with xquery `%s'\n",
               NULL != xquery ? xquery : "NULL");

Modified: gnunet/src/regex/regex_internal_dht.c
===================================================================
--- gnunet/src/regex/regex_internal_dht.c       2013-06-26 11:55:44 UTC (rev 
27624)
+++ gnunet/src/regex/regex_internal_dht.c       2013-06-26 11:58:56 UTC (rev 
27625)
@@ -382,7 +382,7 @@
  */
 static void
 dht_get_string_handler (void *cls, struct GNUNET_TIME_Absolute exp,
-                        const struct GNUNET_HashCode * key,
+                        const struct GNUNET_HashCode *key,
                         const struct GNUNET_PeerIdentity *get_path,
                         unsigned int get_path_length,
                         const struct GNUNET_PeerIdentity *put_path,
@@ -398,7 +398,8 @@
   char *datastore;
 
 #if DEBUG_DHT
-  if (NULL != put_path && 0 != put_path_length)
+  if ( (NULL != put_path) && 
+       (0 != put_path_length) )
   {
     datastore = GNUNET_strdup (GNUNET_i2s (&put_path[put_path_length - 1]));
   }