diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-09-19 16:17:52 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-09-19 16:17:52 +0000 |
commit | f2c3d575ce12a4f48cb54bb7847922a24395eda8 (patch) | |
tree | 4bbd639d361269d0a42441399934c54ba7f23fc3 /src/regex | |
parent | ed6aacba92cc6f832c82e56fec4fd4d161342e6b (diff) | |
download | gnunet-f2c3d575ce12a4f48cb54bb7847922a24395eda8.tar.gz gnunet-f2c3d575ce12a4f48cb54bb7847922a24395eda8.zip |
- tweaks for hex experiments
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/gnunet-daemon-regexprofiler.c | 2 | ||||
-rw-r--r-- | src/regex/regex_test_lib.c | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c index e39a9de93..7f70c2cc0 100644 --- a/src/regex/gnunet-daemon-regexprofiler.c +++ b/src/regex/gnunet-daemon-regexprofiler.c | |||
@@ -347,7 +347,7 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
347 | REGEX_TEST_free_from_file (components); | 347 | REGEX_TEST_free_from_file (components); |
348 | 348 | ||
349 | /* Announcing regexes from policy_filename */ | 349 | /* Announcing regexes from policy_filename */ |
350 | GNUNET_asprintf (&rx_with_pfx, "%s(%s)(0|1)*", regex_prefix, regex); | 350 | 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); |
351 | announce_regex (rx_with_pfx); | 351 | announce_regex (rx_with_pfx); |
352 | GNUNET_free (regex); | 352 | GNUNET_free (regex); |
353 | GNUNET_free (rx_with_pfx); | 353 | GNUNET_free (rx_with_pfx); |
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c index d39db7ef8..c55e0499a 100644 --- a/src/regex/regex_test_lib.c +++ b/src/regex/regex_test_lib.c | |||
@@ -390,17 +390,7 @@ REGEX_TEST_read_from_file (const char *filename) | |||
390 | offset += len + 1; | 390 | offset += len + 1; |
391 | if (len < 1) | 391 | if (len < 1) |
392 | continue; | 392 | continue; |
393 | if (len < 6 || strncmp (®ex[len - 6], "(0|1)*", 6) != 0) | 393 | regex[len] = '\0'; |
394 | { | ||
395 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
396 | "%s (line %u) does not end in \"(0|1)*\"\n", | ||
397 | buffer, nr); | ||
398 | } | ||
399 | else | ||
400 | { | ||
401 | len -= 6; | ||
402 | regex[len] = '\0'; | ||
403 | } | ||
404 | regex = GNUNET_realloc (regex, len + 1); | 394 | regex = GNUNET_realloc (regex, len + 1); |
405 | GNUNET_array_grow (regexes, nr, nr + 1); | 395 | GNUNET_array_grow (regexes, nr, nr + 1); |
406 | GNUNET_assert (NULL == regexes[nr - 2]); | 396 | GNUNET_assert (NULL == regexes[nr - 2]); |