continuing refactoring of regex library structure, disambiguating symbol names between old regex library which is now internal and the public API; moving IP-to-regex conversion functions to tun library, as only vpn is using those to begin with

1 files changed, 37 insertions, 37 deletions

diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index 3ae607352..303a0ce07 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -25,7 +25,7 @@
 #include <regex.h>
 #include <time.h>
 #include "platform.h"
-#include "gnunet_regex_lib.h"
+#include "regex_internal_lib.h"
 #include "regex_internal.h"
 
 #define KEEP_FILES 1
@@ -73,7 +73,7 @@ int
 main (int argc, char *argv[])
 {
   int error;
-  struct GNUNET_REGEX_Automaton *a;
+  struct REGEX_ITERNAL_Automaton *a;
   unsigned int i;
   const char *filename = "test_graph.dot";
 
@@ -97,58 +97,58 @@ main (int argc, char *argv[])
   for (i = 0; i < 12; i++)
   {
     /* Check NFA graph creation */
-    a = GNUNET_REGEX_construct_nfa (regex[i], strlen (regex[i]));
-    GNUNET_REGEX_automaton_save_graph (a, filename, GNUNET_REGEX_GRAPH_DEFAULT);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_ITERNAL_automaton_save_graph (a, filename, REGEX_ITERNAL_GRAPH_DEFAULT);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = GNUNET_REGEX_construct_nfa (regex[i], strlen (regex[i]));
-    GNUNET_REGEX_automaton_save_graph (a, filename,
-                                       GNUNET_REGEX_GRAPH_DEFAULT |
-                                       GNUNET_REGEX_GRAPH_VERBOSE);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_ITERNAL_automaton_save_graph (a, filename,
+                                       REGEX_ITERNAL_GRAPH_DEFAULT |
+                                       REGEX_ITERNAL_GRAPH_VERBOSE);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = GNUNET_REGEX_construct_nfa (regex[i], strlen (regex[i]));
-    GNUNET_REGEX_automaton_save_graph (a, filename,
-                                       GNUNET_REGEX_GRAPH_DEFAULT |
-                                       GNUNET_REGEX_GRAPH_COLORING);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_ITERNAL_automaton_save_graph (a, filename,
+                                       REGEX_ITERNAL_GRAPH_DEFAULT |
+                                       REGEX_ITERNAL_GRAPH_COLORING);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = GNUNET_REGEX_construct_nfa (regex[i], strlen (regex[i]));
-    GNUNET_REGEX_automaton_save_graph (a, filename,
-                                       GNUNET_REGEX_GRAPH_DEFAULT |
-                                       GNUNET_REGEX_GRAPH_VERBOSE |
-                                       GNUNET_REGEX_GRAPH_COLORING);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_ITERNAL_automaton_save_graph (a, filename,
+                                       REGEX_ITERNAL_GRAPH_DEFAULT |
+                                       REGEX_ITERNAL_GRAPH_VERBOSE |
+                                       REGEX_ITERNAL_GRAPH_COLORING);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
 
     /* Check DFA graph creation */
-    a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 0);
-    GNUNET_REGEX_automaton_save_graph (a, filename, GNUNET_REGEX_GRAPH_DEFAULT);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
+    REGEX_ITERNAL_automaton_save_graph (a, filename, REGEX_ITERNAL_GRAPH_DEFAULT);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 0);
-    GNUNET_REGEX_automaton_save_graph (a, filename,
-                                       GNUNET_REGEX_GRAPH_DEFAULT |
-                                       GNUNET_REGEX_GRAPH_VERBOSE);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
+    REGEX_ITERNAL_automaton_save_graph (a, filename,
+                                       REGEX_ITERNAL_GRAPH_DEFAULT |
+                                       REGEX_ITERNAL_GRAPH_VERBOSE);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 0);
-    GNUNET_REGEX_automaton_save_graph (a, filename,
-                                       GNUNET_REGEX_GRAPH_DEFAULT |
-                                       GNUNET_REGEX_GRAPH_COLORING);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
+    REGEX_ITERNAL_automaton_save_graph (a, filename,
+                                       REGEX_ITERNAL_GRAPH_DEFAULT |
+                                       REGEX_ITERNAL_GRAPH_COLORING);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
 
-    a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 4);
-    GNUNET_REGEX_automaton_save_graph (a, filename, GNUNET_REGEX_GRAPH_DEFAULT);
-    GNUNET_REGEX_automaton_destroy (a);
+    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 4);
+    REGEX_ITERNAL_automaton_save_graph (a, filename, REGEX_ITERNAL_GRAPH_DEFAULT);
+    REGEX_ITERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
   }