#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_regex_lib.h"
+#include "regex_internal_lib.h"
#include "gnunet_mysql_lib.h"
#include <mysql/mysql.h>
{
struct ProgressMeter *ret;
- ret = GNUNET_malloc (sizeof (struct ProgressMeter));
+ ret = GNUNET_new (struct ProgressMeter);
ret->print = print;
ret->total = total;
ret->modnum = total / 4;
static void
regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof,
int accepting, unsigned int num_edges,
- const struct GNUNET_REGEX_Edge *edges)
+ const struct REGEX_BLOCK_Edge *edges)
{
unsigned int i;
int result;
static int
announce_regex (const char *regex)
{
- struct GNUNET_REGEX_Automaton *dfa;
+ struct REGEX_INTERNAL_Automaton *dfa;
dfa =
- GNUNET_REGEX_construct_dfa (regex, strlen (regex), max_path_compression);
+ REGEX_INTERNAL_construct_dfa (regex, strlen (regex), max_path_compression);
if (NULL == dfa)
{
return GNUNET_SYSERR;
}
- GNUNET_REGEX_iterate_all_edges (dfa, ®ex_iterator, NULL);
+ REGEX_INTERNAL_iterate_all_edges (dfa, ®ex_iterator, NULL);
- GNUNET_REGEX_automaton_destroy (dfa);
+ REGEX_INTERNAL_automaton_destroy (dfa);
return GNUNET_OK;
}