diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-06-20 08:32:50 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-06-20 08:32:50 +0000 |
commit | 21a2b4f95b4488645ba5a6254fcb8919c4915f73 (patch) | |
tree | 00c92cb7103cc14fba7e63e8dee99fe711856863 /src/regex/gnunet-regex-simulation-profiler.c | |
parent | 5533b105943b4f6dd688c1758350cd83ebeab3b9 (diff) | |
download | gnunet-21a2b4f95b4488645ba5a6254fcb8919c4915f73.tar.gz gnunet-21a2b4f95b4488645ba5a6254fcb8919c4915f73.zip |
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
Diffstat (limited to 'src/regex/gnunet-regex-simulation-profiler.c')
-rw-r--r-- | src/regex/gnunet-regex-simulation-profiler.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c index 604d25612..b3d1ff873 100644 --- a/src/regex/gnunet-regex-simulation-profiler.c +++ b/src/regex/gnunet-regex-simulation-profiler.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_util_lib.h" | 30 | #include "gnunet_util_lib.h" |
31 | #include "gnunet_regex_lib.h" | 31 | #include "regex_internal_lib.h" |
32 | #include "gnunet_mysql_lib.h" | 32 | #include "gnunet_mysql_lib.h" |
33 | #include <mysql/mysql.h> | 33 | #include <mysql/mysql.h> |
34 | 34 | ||
@@ -335,7 +335,7 @@ return_ok (void *cls, unsigned int num_values, MYSQL_BIND * values) | |||
335 | static void | 335 | static void |
336 | regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof, | 336 | regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof, |
337 | int accepting, unsigned int num_edges, | 337 | int accepting, unsigned int num_edges, |
338 | const struct GNUNET_REGEX_Edge *edges) | 338 | const struct REGEX_ITERNAL_Edge *edges) |
339 | { | 339 | { |
340 | unsigned int i; | 340 | unsigned int i; |
341 | int result; | 341 | int result; |
@@ -460,10 +460,10 @@ regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof, | |||
460 | static int | 460 | static int |
461 | announce_regex (const char *regex) | 461 | announce_regex (const char *regex) |
462 | { | 462 | { |
463 | struct GNUNET_REGEX_Automaton *dfa; | 463 | struct REGEX_ITERNAL_Automaton *dfa; |
464 | 464 | ||
465 | dfa = | 465 | dfa = |
466 | GNUNET_REGEX_construct_dfa (regex, strlen (regex), max_path_compression); | 466 | REGEX_ITERNAL_construct_dfa (regex, strlen (regex), max_path_compression); |
467 | 467 | ||
468 | if (NULL == dfa) | 468 | if (NULL == dfa) |
469 | { | 469 | { |
@@ -473,9 +473,9 @@ announce_regex (const char *regex) | |||
473 | return GNUNET_SYSERR; | 473 | return GNUNET_SYSERR; |
474 | } | 474 | } |
475 | 475 | ||
476 | GNUNET_REGEX_iterate_all_edges (dfa, ®ex_iterator, NULL); | 476 | REGEX_ITERNAL_iterate_all_edges (dfa, ®ex_iterator, NULL); |
477 | 477 | ||
478 | GNUNET_REGEX_automaton_destroy (dfa); | 478 | REGEX_ITERNAL_automaton_destroy (dfa); |
479 | 479 | ||
480 | return GNUNET_OK; | 480 | return GNUNET_OK; |
481 | } | 481 | } |