aboutsummaryrefslogtreecommitdiff
path: root/src/regex/test_regex_proofs.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-12-14 20:12:39 +0000
committerChristian Grothoff <christian@grothoff.org>2012-12-14 20:12:39 +0000
commita3aacce89467a1cbcd2193d8a667aad069b47be5 (patch)
treee2fc058e0fb2d89af10bedd36d5c472925b8af0e /src/regex/test_regex_proofs.c
parent0f16f15060952ceae16cf6e321b161b8793eed3c (diff)
-minor fixes
Diffstat (limited to 'src/regex/test_regex_proofs.c')
-rw-r--r--src/regex/test_regex_proofs.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c
index a5e049fba9..92a3a411fc 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/regex/test_regex_proofs.c
@@ -38,7 +38,7 @@
*
* @return 0 on success, 1 on failure
*/
-unsigned int
+static unsigned int
test_proof (const char *regex)
{
unsigned int error;
@@ -47,9 +47,11 @@ test_proof (const char *regex)
const char *c_rx2;
dfa = GNUNET_REGEX_construct_dfa (regex, strlen (regex), 1);
+ GNUNET_assert (NULL != dfa);
c_rx1 = GNUNET_strdup (GNUNET_REGEX_get_canonical_regex (dfa));
GNUNET_REGEX_automaton_destroy (dfa);
dfa = GNUNET_REGEX_construct_dfa (c_rx1, strlen (c_rx1), 1);
+ GNUNET_assert (NULL != dfa);
c_rx2 = GNUNET_REGEX_get_canonical_regex (dfa);
error = (0 == strcmp (c_rx1, c_rx2)) ? 0 : 1;
@@ -67,6 +69,7 @@ test_proof (const char *regex)
return error;
}
+
/**
* Use 'test_proof' function to randomly test the canonical regexes of 'count'
* random expressions of length 'rx_length'.
@@ -76,7 +79,7 @@ test_proof (const char *regex)
*
* @return 0 on succes, number of failures otherwise.
*/
-unsigned int
+static unsigned int
test_proofs_random (unsigned int count, size_t rx_length)
{
unsigned int i;
@@ -95,13 +98,14 @@ test_proofs_random (unsigned int count, size_t rx_length)
return failures;
}
+
/**
* Test a number of known examples of regexes for proper canonicalization.
*
* @return 0 on success, number of failures otherwise.
*/
-unsigned int
-test_proofs_static (void)
+static unsigned int
+test_proofs_static ()
{
unsigned int i;
unsigned int error;
@@ -128,6 +132,8 @@ test_proofs_static (void)
{
dfa1 = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 1);
dfa2 = GNUNET_REGEX_construct_dfa (regex[i + 1], strlen (regex[i + 1]), 1);
+ GNUNET_assert (NULL != dfa1);
+ GNUNET_assert (NULL != dfa2);
canon_rx1 = GNUNET_REGEX_get_canonical_regex (dfa1);
canon_rx2 = GNUNET_REGEX_get_canonical_regex (dfa2);