[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29429 - gnunet/src/regex
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29429 - gnunet/src/regex |
Date: |
Fri, 20 Sep 2013 14:15:59 +0200 |
Author: bartpolot
Date: 2013-09-20 14:15:59 +0200 (Fri, 20 Sep 2013)
New Revision: 29429
Modified:
gnunet/src/regex/plugin_block_regex.c
Log:
- dont require xquery for PUTs
Modified: gnunet/src/regex/plugin_block_regex.c
===================================================================
--- gnunet/src/regex/plugin_block_regex.c 2013-09-20 08:35:11 UTC (rev
29428)
+++ gnunet/src/regex/plugin_block_regex.c 2013-09-20 12:15:59 UTC (rev
29429)
@@ -60,35 +60,37 @@
size_t reply_block_size)
{
if (NULL == reply_block)
- {
- if (0 != xquery_size)
- {
- const char *s;
-
- s = (const char *) xquery;
- if ('\0' != s[xquery_size - 1]) /* must be valid 0-terminated string
*/
- {
- GNUNET_break_op (0);
- return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
- }
- }
- return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
- }
+ {
+ if (0 != xquery_size)
+ {
+ const char *s;
+
+ s = (const char *) xquery;
+ if ('\0' != s[xquery_size - 1]) /* must be valid 0-terminated string */
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
+ }
+ }
+ return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+ }
if (0 != xquery_size)
{
- const char *query;
+ const char *s;
- query = (const char *) xquery;
- if ('\0' != query[xquery_size - 1]) /* must be valid 0-terminated string */
+ s = (const char *) xquery;
+ if ('\0' != s[xquery_size - 1]) /* must be valid 0-terminated string */
{
GNUNET_break_op (0);
return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
}
}
- else
+ else if (NULL != query)
{
/* xquery is required for regex, at least an empty string */
GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "type %d, query %p, xquery %p\n",
+ type, query, xquery);
return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
}
switch (REGEX_BLOCK_check (reply_block,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29429 - gnunet/src/regex,
gnunet <=