-follow naming and coding style conventions

2 files changed, 7 insertions, 5 deletions

diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c
index b945b9198..3a18a731f 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/regex/regex_block_lib.c
@@ -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 @@ check_edge (void *cls,
             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 @@ REGEX_BLOCK_check (const struct RegexBlock *block,
                    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");
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c
index 28ab884eb..bf15b9a96 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -382,7 +382,7 @@ regex_find_path (const struct GNUNET_HashCode *key,
  */
 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 @@ dht_get_string_handler (void *cls, struct GNUNET_TIME_Absolute exp,
   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]));
   }