-renaming symbols of the block library to use the REGEX_BLOCK_ prefix and not the REGEX_INTERNAL_ prefix

9 files changed, 24 insertions, 24 deletions

diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c
index dcb6c02f6..fdbc918c2 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -335,7 +335,7 @@ return_ok (void *cls, unsigned int num_values, MYSQL_BIND * values)
 static void
 regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof,
                 int accepting, unsigned int num_edges,
-                const struct REGEX_INTERNAL_Edge *edges)
+                const struct REGEX_BLOCK_Edge *edges)
 {
   unsigned int i;
   int result;
diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c
index bc723b6cb..bf19a2bff 100644
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -53,7 +53,7 @@ iter (void *cls,
       const char *proof,
       int accepting,
       unsigned int num_edges,
-      const struct REGEX_INTERNAL_Edge *edges)
+      const struct REGEX_BLOCK_Edge *edges)
 {
   unsigned int i;
 
diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c
index 565356786..9bbf4afed 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/regex/plugin_block_regex.c
@@ -108,10 +108,10 @@ evaluate_block_regex (void *cls, enum GNUNET_BLOCK_Type type,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Block with no xquery\n");
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  key: %s, %u edges\n",
                 GNUNET_h2s (&rblock->key), ntohl (rblock->n_edges));
-    REGEX_INTERNAL_block_iterate (rblock, reply_block_size, &rdebug, NULL);
+    REGEX_BLOCK_iterate (rblock, reply_block_size, &rdebug, NULL);
     return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
   }
-  switch (REGEX_INTERNAL_block_check (reply_block,
+  switch (REGEX_BLOCK_check (reply_block,
                                       reply_block_size,
                                       xquery))
   {
diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c
index 052c712c1..851bdba14 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/regex/regex_block_lib.c
@@ -82,7 +82,7 @@ check_edge (void *cls,
 
 
 int
-REGEX_INTERNAL_block_check (const struct RegexBlock *block,
+REGEX_BLOCK_check (const struct RegexBlock *block,
                             size_t size,
                             const char *xquery)
 {
@@ -98,7 +98,7 @@ REGEX_INTERNAL_block_check (const struct RegexBlock *block,
   ctx.xquery = xquery;
   ctx.found = GNUNET_NO;
   ctx.key = GNUNET_strdup (GNUNET_h2s (&block->key));
-  res = REGEX_INTERNAL_block_iterate (block, size, &check_edge, &ctx);
+  res = REGEX_BLOCK_iterate (block, size, &check_edge, &ctx);
   GNUNET_free (ctx.key);
   if (GNUNET_SYSERR == res)
     return GNUNET_SYSERR;
@@ -109,7 +109,7 @@ REGEX_INTERNAL_block_check (const struct RegexBlock *block,
 
 
 int
-REGEX_INTERNAL_block_iterate (const struct RegexBlock *block,
+REGEX_BLOCK_iterate (const struct RegexBlock *block,
                             size_t size,
                             REGEX_INTERNAL_EgdeIterator iterator,
                             void *iter_cls)
@@ -191,10 +191,10 @@ REGEX_INTERNAL_block_iterate (const struct RegexBlock *block,
  * @return the regex block
  */
 struct RegexBlock *
-REGEX_INTERNAL_block_create (const struct GNUNET_HashCode *key,
+REGEX_BLOCK_create (const struct GNUNET_HashCode *key,
                              const char *proof,
                              unsigned int num_edges,
-                             const struct REGEX_INTERNAL_Edge *edges,
+                             const struct REGEX_BLOCK_Edge *edges,
                              int accepting,
                              size_t *rsize)
 {
diff --git a/src/regex/regex_block_lib.h b/src/regex/regex_block_lib.h
index ad4884f4d..79bd20a1e 100644
--- a/src/regex/regex_block_lib.h
+++ b/src/regex/regex_block_lib.h
@@ -43,7 +43,7 @@ extern "C"
 /**
  * Edge representation.
  */
-struct REGEX_INTERNAL_Edge
+struct REGEX_BLOCK_Edge
 {
   /**
    * Label of the edge.  FIXME: might want to not consume exactly multiples of 8 bits, need length!
@@ -70,12 +70,12 @@ struct REGEX_INTERNAL_Edge
  *         GNUNET_SYSERR if the block is invalid.
  */
 int
-REGEX_INTERNAL_block_check (const struct RegexBlock *block,
+REGEX_BLOCK_check (const struct RegexBlock *block,
                             size_t size,
                             const char *xquery);
 
 
-/* FIXME: might want to use 'struct REGEX_INTERNAL_Edge' here instead of 3 arguments! */
+/* FIXME: might want to use 'struct REGEX_BLOCK_Edge' here instead of 3 arguments! */
 
 /**
  * Iterator over edges in a block.
@@ -110,7 +110,7 @@ typedef int (*REGEX_INTERNAL_EgdeIterator)(void *cls,
  *         be errors in further edges.
  */
 int
-REGEX_INTERNAL_block_iterate (const struct RegexBlock *block,
+REGEX_BLOCK_iterate (const struct RegexBlock *block,
                             size_t size,
                             REGEX_INTERNAL_EgdeIterator iterator,
                             void *iter_cls);
@@ -125,10 +125,10 @@ REGEX_INTERNAL_block_iterate (const struct RegexBlock *block,
  * @return the regex block
  */
 struct RegexBlock *
-REGEX_INTERNAL_block_create (const struct GNUNET_HashCode *key,
+REGEX_BLOCK_create (const struct GNUNET_HashCode *key,
                              const char *proof,
                              unsigned int num_edges,
-                             const struct REGEX_INTERNAL_Edge *edges,
+                             const struct REGEX_BLOCK_Edge *edges,
                              int accepting,
                              size_t *rsize);
 
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index 6fda695a7..059aaaed6 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -205,7 +205,7 @@ state_compare (const void *a, const void *b)
  * @return number of edges.
  */
 static unsigned int
-state_get_edges (struct REGEX_INTERNAL_State *s, struct REGEX_INTERNAL_Edge *edges)
+state_get_edges (struct REGEX_INTERNAL_State *s, struct REGEX_BLOCK_Edge *edges)
 {
   struct REGEX_INTERNAL_Transition *t;
   unsigned int count;
@@ -3372,8 +3372,8 @@ iterate_initial_edge (const unsigned int min_len, const unsigned int max_len,
   char *temp;
   struct REGEX_INTERNAL_Transition *t;
   unsigned int num_edges = state->transition_count;
-  struct REGEX_INTERNAL_Edge edges[num_edges];
-  struct REGEX_INTERNAL_Edge edge[1];
+  struct REGEX_BLOCK_Edge edges[num_edges];
+  struct REGEX_BLOCK_Edge edge[1];
   struct GNUNET_HashCode hash;
   struct GNUNET_HashCode hash_new;
 
@@ -3463,7 +3463,7 @@ REGEX_INTERNAL_iterate_all_edges (struct REGEX_INTERNAL_Automaton *a,
 
   for (s = a->states_head; NULL != s; s = s->next)
   {
-    struct REGEX_INTERNAL_Edge edges[s->transition_count];
+    struct REGEX_BLOCK_Edge edges[s->transition_count];
     unsigned int num_edges;
 
     num_edges = state_get_edges (s, edges);
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c
index 3ddee06ff..5618eb66a 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -87,7 +87,7 @@ regex_iterator (void *cls,
                 const char *proof,
                 int accepting,
                 unsigned int num_edges,
-                const struct REGEX_INTERNAL_Edge *edges)
+                const struct REGEX_BLOCK_Edge *edges)
 {
   struct REGEX_INTERNAL_Announcement *h = cls;
   struct RegexBlock *block;
@@ -123,7 +123,7 @@ regex_iterator (void *cls,
                     DHT_TTL,
                     NULL, NULL);
   }
-  block = REGEX_INTERNAL_block_create (key, proof,
+  block = REGEX_BLOCK_create (key, proof,
                                        num_edges, edges,
                                        accepting,
                                        &size);
@@ -573,7 +573,7 @@ regex_next_edge (const struct RegexBlock *block,
   /* Find the longest match for the current string position, 
    * among tokens in the given block */
   ctx->longest_match = 0;
-  result = REGEX_INTERNAL_block_iterate (block, size,
+  result = REGEX_BLOCK_iterate (block, size,
                                        &regex_edge_iterator, ctx);
   GNUNET_break (GNUNET_OK == result);
 
diff --git a/src/regex/regex_internal_lib.h b/src/regex/regex_internal_lib.h
index f8bf36344..1c8946449 100644
--- a/src/regex/regex_internal_lib.h
+++ b/src/regex/regex_internal_lib.h
@@ -135,7 +135,7 @@ typedef void (*REGEX_INTERNAL_KeyIterator)(void *cls,
                                          const char *proof,
                                          int accepting,
                                          unsigned int num_edges,
-                                         const struct REGEX_INTERNAL_Edge *edges);
+                                         const struct REGEX_BLOCK_Edge *edges);
 
 
 /**
diff --git a/src/regex/test_regex_iterate_api.c b/src/regex/test_regex_iterate_api.c
index cf7ee2298..fa94c58ab 100644
--- a/src/regex/test_regex_iterate_api.c
+++ b/src/regex/test_regex_iterate_api.c
@@ -61,7 +61,7 @@ struct RegexStringPair
 static void
 key_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof,
               int accepting, unsigned int num_edges,
-              const struct REGEX_INTERNAL_Edge *edges)
+              const struct REGEX_BLOCK_Edge *edges)
 {
   unsigned int i;
   struct IteratorContext *ctx = cls;