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

[gnunet]

Author: bartpolot
Date: 2013-09-19 18:17:52 +0200 (Thu, 19 Sep 2013)
New Revision: 29422

Modified:
   gnunet/src/regex/gnunet-daemon-regexprofiler.c
   gnunet/src/regex/regex_test_lib.c
Log:
- tweaks for hex experiments

Modified: gnunet/src/regex/gnunet-daemon-regexprofiler.c
===================================================================
--- gnunet/src/regex/gnunet-daemon-regexprofiler.c      2013-09-19 15:56:45 UTC 
(rev 29421)
+++ gnunet/src/regex/gnunet-daemon-regexprofiler.c      2013-09-19 16:17:52 UTC 
(rev 29422)
@@ -347,7 +347,7 @@
   REGEX_TEST_free_from_file (components);
 
   /* Announcing regexes from policy_filename */
-  GNUNET_asprintf (&rx_with_pfx, "%s(%s)(0|1)*", regex_prefix, regex);
+  GNUNET_asprintf (&rx_with_pfx, "%s(%s)(0|1|2|3|4|5|6|7|8|9|a|b|c|d|e|f)*", 
regex_prefix, regex);
   announce_regex (rx_with_pfx);
   GNUNET_free (regex);
   GNUNET_free (rx_with_pfx);

Modified: gnunet/src/regex/regex_test_lib.c
===================================================================
--- gnunet/src/regex/regex_test_lib.c   2013-09-19 15:56:45 UTC (rev 29421)
+++ gnunet/src/regex/regex_test_lib.c   2013-09-19 16:17:52 UTC (rev 29422)
@@ -390,17 +390,7 @@
     offset += len + 1;
     if (len < 1)
       continue;
-    if (len < 6 || strncmp (&regex[len - 6], "(0|1)*", 6) != 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "%s (line %u) does not end in \"(0|1)*\"\n",
-                  buffer, nr);
-    }
-    else
-    {
-      len -= 6;
-      regex[len] = '\0';
-    }
+    regex[len] = '\0';
     regex = GNUNET_realloc (regex, len + 1);
     GNUNET_array_grow (regexes, nr, nr + 1);
     GNUNET_assert (NULL == regexes[nr - 2]);