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/regex_test_lib.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/regex_test_lib.c')
-rw-r--r-- | src/regex/regex_test_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c index df873c112..dbb864370 100644 --- a/src/regex/regex_test_lib.c +++ b/src/regex/regex_test_lib.c | |||
@@ -305,7 +305,7 @@ regex_ctx_destroy (struct RegexCombineCtx *ctx) | |||
305 | * This function DOES NOT support arbitrary regex combining. | 305 | * This function DOES NOT support arbitrary regex combining. |
306 | */ | 306 | */ |
307 | char * | 307 | char * |
308 | GNUNET_REGEX_combine (char * const regexes[]) | 308 | REGEX_ITERNAL_combine (char * const regexes[]) |
309 | { | 309 | { |
310 | unsigned int i; | 310 | unsigned int i; |
311 | char *combined; | 311 | char *combined; |
@@ -333,15 +333,15 @@ GNUNET_REGEX_combine (char * const regexes[]) | |||
333 | 333 | ||
334 | /** | 334 | /** |
335 | * Read a set of regexes from a file, one per line and return them in an array | 335 | * Read a set of regexes from a file, one per line and return them in an array |
336 | * suitable for GNUNET_REGEX_combine. | 336 | * suitable for REGEX_ITERNAL_combine. |
337 | * The array must be free'd using GNUNET_REGEX_free_from_file. | 337 | * The array must be free'd using REGEX_ITERNAL_free_from_file. |
338 | * | 338 | * |
339 | * @param filename Name of the file containing the regexes. | 339 | * @param filename Name of the file containing the regexes. |
340 | * | 340 | * |
341 | * @return A newly allocated, NULL terminated array of regexes. | 341 | * @return A newly allocated, NULL terminated array of regexes. |
342 | */ | 342 | */ |
343 | char ** | 343 | char ** |
344 | GNUNET_REGEX_read_from_file (const char *filename) | 344 | REGEX_ITERNAL_read_from_file (const char *filename) |
345 | { | 345 | { |
346 | struct GNUNET_DISK_FileHandle *f; | 346 | struct GNUNET_DISK_FileHandle *f; |
347 | unsigned int nr; | 347 | unsigned int nr; |
@@ -421,7 +421,7 @@ GNUNET_REGEX_read_from_file (const char *filename) | |||
421 | * @param regexes NULL-terminated array of regexes. | 421 | * @param regexes NULL-terminated array of regexes. |
422 | */ | 422 | */ |
423 | void | 423 | void |
424 | GNUNET_REGEX_free_from_file (char **regexes) | 424 | REGEX_ITERNAL_free_from_file (char **regexes) |
425 | { | 425 | { |
426 | unsigned int i; | 426 | unsigned int i; |
427 | 427 | ||