ip/prefix to regex

[oweals/gnunet.git] / src / regex / regex_graph.c

diff --git a/src/regex/regex_graph.c b/src/regex/regex_graph.c
index 9dfdb15a4ec5bf73824b3ed791a71188dc324345..483cef698d46faec98b46084bfb010b89e1b5f81 100644 (file)
--- a/src/regex/regex_graph.c
+++ b/src/regex/regex_graph.c
@@ -167,10 +167,10 @@ GNUNET_REGEX_automaton_save_graph_step (void *cls, unsigned int count,
   char *to_name;
 
   if (GNUNET_YES == ctx->verbose)
-    GNUNET_asprintf (&name, "%i (%s) (%s) (%s)", s->proof_id, s->name, s->proof,
+    GNUNET_asprintf (&name, "%i (%s) (%s) (%s)", s->dfs_id, s->name, s->proof,
                      GNUNET_h2s (&s->hash));
   else
-    GNUNET_asprintf (&name, "%i", s->proof_id);
+    GNUNET_asprintf (&name, "%i", s->dfs_id);
 
   if (s->accepting)
   {
@@ -188,7 +188,8 @@ GNUNET_REGEX_automaton_save_graph_step (void *cls, unsigned int count,
   }
   else if (GNUNET_YES == ctx->coloring)
   {
-    GNUNET_asprintf (&s_acc, "\"%s\" [shape=circle, color=\"0.%i 0.8 0.95\"];\n", name,
+    GNUNET_asprintf (&s_acc,
+                     "\"%s\" [shape=circle, color=\"0.%i 0.8 0.95\"];\n", name,
                      s->scc_id);
   }
   else
@@ -196,11 +197,8 @@ GNUNET_REGEX_automaton_save_graph_step (void *cls, unsigned int count,
     GNUNET_asprintf (&s_acc, "\"%s\" [shape=circle];\n", name, s->scc_id);
   }
 
-  if (NULL == s_acc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not print state %s\n", s->name);
-    return;
-  }
+  GNUNET_assert (NULL != s_acc);
+
   fwrite (s_acc, strlen (s_acc), 1, ctx->filep);
   GNUNET_free (s_acc);
   s_acc = NULL;
@@ -217,14 +215,14 @@ GNUNET_REGEX_automaton_save_graph_step (void *cls, unsigned int count,
 
     if (GNUNET_YES == ctx->verbose)
     {
-      GNUNET_asprintf (&to_name, "%i (%s) (%s) (%s)", ctran->to_state->proof_id,
+      GNUNET_asprintf (&to_name, "%i (%s) (%s) (%s)", ctran->to_state->dfs_id,
                        ctran->to_state->name, ctran->to_state->proof,
                        GNUNET_h2s (&ctran->to_state->hash));
     }
     else
-      GNUNET_asprintf (&to_name, "%i", ctran->to_state->proof_id);
+      GNUNET_asprintf (&to_name, "%i", ctran->to_state->dfs_id);
 
-    if (ctran->label == 0)
+    if (NULL == ctran->label)
     {
       if (GNUNET_YES == ctx->coloring)
       {
@@ -234,8 +232,8 @@ GNUNET_REGEX_automaton_save_graph_step (void *cls, unsigned int count,
       }
       else
       {
-        GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"ε\"];\n",
-                         name, to_name, s->scc_id);
+        GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"ε\"];\n", name,
+                         to_name, s->scc_id);
       }
     }
     else
@@ -243,24 +241,19 @@ GNUNET_REGEX_automaton_save_graph_step (void *cls, unsigned int count,
       if (GNUNET_YES == ctx->coloring)
       {
         GNUNET_asprintf (&s_tran,
-                         "\"%s\" -> \"%s\" [label = \"%c\", color=\"0.%i 0.8 0.95\"];\n",
+                         "\"%s\" -> \"%s\" [label = \"%s\", color=\"0.%i 0.8 0.95\"];\n",
                          name, to_name, ctran->label, s->scc_id);
       }
       else
       {
-        GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"%c\"];\n", name,
+        GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"%s\"];\n", name,
                          to_name, ctran->label, s->scc_id);
       }
     }
 
     GNUNET_free (to_name);
 
-    if (NULL == s_tran)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not print state %s\n",
-                  s->name);
-      return;
-    }
+    GNUNET_assert (NULL != s_tran);
 
     fwrite (s_tran, strlen (s_tran), 1, ctx->filep);
     GNUNET_free (s_tran);
@@ -314,12 +307,14 @@ GNUNET_REGEX_automaton_save_graph (struct GNUNET_REGEX_Automaton *a,
   }
 
   /* First add the SCCs to the automaton, so we can color them nicely */
-  scc_tarjan (a);
+  if (GNUNET_YES == ctx.coloring)
+    scc_tarjan (a);
 
   start = "digraph G {\nrankdir=LR\n";
   fwrite (start, strlen (start), 1, ctx.filep);
 
-  GNUNET_REGEX_automaton_traverse (a, &GNUNET_REGEX_automaton_save_graph_step,
+  GNUNET_REGEX_automaton_traverse (a, a->start, NULL, NULL,
+                                   &GNUNET_REGEX_automaton_save_graph_step,
                                    &ctx);
 
   end = "\n}\n";