#include <libmemcached/csl/common.h>
#include <libmemcached/csl/context.h>
-void Context::abort(const char *error_arg, yytokentype last_token, const char *last_token_str)
+void Context::abort(const char *error_arg, config_tokentype last_token, const char *last_token_str)
{
rc= MEMCACHED_PARSE_ERROR;
(void)last_token;
memcached_set_parser_error(*memc, MEMCACHED_AT, "unknown parsing error");
}
-void Context::error(const char *error_arg, yytokentype last_token, const char *last_token_str)
+void Context::error(const char *error_arg, config_tokentype last_token, const char *last_token_str)
{
rc= MEMCACHED_PARSE_ERROR;
if (not error_arg)
return;
}
- if (error_arg and strcmp(error_arg, "memory exhausted") == 0)
+ if (strcmp(error_arg, "memory exhausted") == 0)
{
(void)memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, memcached_string_make_from_cstr(error_arg));
return;
// We now test if it is something other then a syntax error, if it we
// return a generic message
- if (error_arg and strcmp(error_arg, "syntax error") == 0)
- { }
- else if (error_arg)
+ if (strcmp(error_arg, "syntax error") != 0)
{
memcached_set_parser_error(*memc, MEMCACHED_AT, "Error occured during parsing (%s)", error_arg);
return;