X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fcsl%2Fcontext.cc;h=44fb4358548177d1913d5d097e0baa7c502c840d;hb=398f48445cacf12679248142f0c86d3a0d6caab6;hp=16852d5b6da16038b05bb8d0938387f2808fb39c;hpb=fc51e5255fe2e55848823d838c1326dd8d27ccad;p=awesomized%2Flibmemcached

diff --git a/libmemcached/csl/context.cc b/libmemcached/csl/context.cc
index 16852d5b..44fb4358 100644
--- a/libmemcached/csl/context.cc
+++ b/libmemcached/csl/context.cc
@@ -67,7 +67,7 @@ void Context::error(const char *error_arg, yytokentype last_token, const char *l
     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;
@@ -75,9 +75,7 @@ void Context::error(const char *error_arg, yytokentype last_token, const char *l
 
   // 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;