aboutsummaryrefslogtreecommitdiff
path: root/src/regex/plugin_block_regex.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-06-26 11:50:16 +0000
committerChristian Grothoff <christian@grothoff.org>2013-06-26 11:50:16 +0000
commit5f38f9933e6f19fcef0ded8aad3d6db4e6cbb666 (patch)
tree7c17cf8ad811c21520f0e73fd7124d5a33c8935b /src/regex/plugin_block_regex.c
parentae4ab9e6ce8d7529bec34bef3d7db62c393dd918 (diff)
downloadgnunet-5f38f9933e6f19fcef0ded8aad3d6db4e6cbb666.tar.gz
gnunet-5f38f9933e6f19fcef0ded8aad3d6db4e6cbb666.zip
-cleaning up block code, moving all of the block logic into the block library
Diffstat (limited to 'src/regex/plugin_block_regex.c')
-rw-r--r--src/regex/plugin_block_regex.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c
index 82341813e..565356786 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/regex/plugin_block_regex.c
@@ -48,11 +48,12 @@
48 */ 48 */
49static int 49static int
50rdebug (void *cls, 50rdebug (void *cls,
51 const char *token, 51 const char *token,
52 size_t len, 52 size_t len,
53 const struct GNUNET_HashCode *key) 53 const struct GNUNET_HashCode *key)
54{ 54{
55 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " %s: %.*s\n", 55 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
56 "%s: %.*s\n",
56 GNUNET_h2s (key), len, token); 57 GNUNET_h2s (key), len, token);
57 return GNUNET_YES; 58 return GNUNET_YES;
58} 59}
@@ -92,7 +93,7 @@ evaluate_block_regex (void *cls, enum GNUNET_BLOCK_Type type,
92 const char *query; 93 const char *query;
93 94
94 query = (const char *) xquery; 95 query = (const char *) xquery;
95 if ('\0' != query[xquery_size - 1]) /* must be valid string */ 96 if ('\0' != query[xquery_size - 1]) /* must be valid 0-terminated string */
96 { 97 {
97 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 98 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
98 "Block xquery not a valid string\n"); 99 "Block xquery not a valid string\n");
@@ -111,8 +112,8 @@ evaluate_block_regex (void *cls, enum GNUNET_BLOCK_Type type,
111 return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; 112 return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
112 } 113 }
113 switch (REGEX_INTERNAL_block_check (reply_block, 114 switch (REGEX_INTERNAL_block_check (reply_block,
114 reply_block_size, 115 reply_block_size,
115 xquery)) 116 xquery))
116 { 117 {
117 case GNUNET_SYSERR: 118 case GNUNET_SYSERR:
118 GNUNET_break_op(0); 119 GNUNET_break_op(0);