libmemcached: fix #13

[awesomized/libmemcached] / libmemcached / options.cc

diff --git a/libmemcached/options.cc b/libmemcached/options.cc
index 16f378e87393dc3a83f7924ea4b7ffec50aecb86..290cfc895b434c90868563ae37476237454dca84 100644 (file)
--- a/libmemcached/options.cc
+++ b/libmemcached/options.cc
@@ -36,13 +36,13 @@
  */
 
 #include <libmemcached/common.h>
-#include <assert.h>
+#include <libmemcached/options.hpp>
 
-#include <libmemcached/options/context.h>
+#include <libmemcached/csl/context.h>
 
 const char *memcached_parse_filename(memcached_st *memc)
 {
-  assert(memc);
+  assert_msg(memc, "Invalid memcached_st");
   return memcached_array_string(memc->configure.filename);
 }
 
@@ -51,13 +51,13 @@ size_t memcached_parse_filename_length(memcached_st *memc)
   return memcached_array_size(memc->configure.filename);
 }
 
-static memcached_return_t _parse_file_options(memcached_st *self, memcached_array_st *real_name)
+static memcached_return_t _parse_file_options(memcached_st& self, memcached_array_st *real_name)
 {
   FILE *fp= fopen(memcached_array_string(real_name), "r");
   if (not fp)
   {
     memcached_string_t error_message= memcached_array_to_string(real_name);
-    memcached_return_t rc=  memcached_set_errno(*self, errno, MEMCACHED_AT, error_message);
+    memcached_return_t rc=  memcached_set_errno(self, errno, MEMCACHED_AT, error_message);
     return rc;
   }
 
@@ -70,7 +70,7 @@ static memcached_return_t _parse_file_options(memcached_st *self, memcached_arra
     if (length == 1 and buffer[0] == '\n')
       continue;
 
-    if (memcached_failed(rc= memcached_parse_configuration(self, buffer, length)))
+    if (memcached_failed(rc= memcached_parse_configuration(&self, buffer, length)))
       break;
   }
   fclose(fp);
@@ -82,30 +82,39 @@ memcached_return_t libmemcached_check_configuration(const char *option_string, s
 {
   memcached_st memc, *memc_ptr;
 
-  if (error_buffer_size)
+  if (option_string == NULL or length == 0)
+  {
+    return MEMCACHED_INVALID_ARGUMENTS;
+  }
+
+  if (error_buffer and error_buffer_size)
+  {
     error_buffer[0]= 0;
+  }
 
   if (not (memc_ptr= memcached_create(&memc)))
+  {
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  }
 
   memcached_return_t rc= memcached_parse_configuration(memc_ptr, option_string, length);
   if (memcached_failed(rc) and error_buffer and error_buffer_size)
   {
     strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
-    error_buffer[length -1]= 0;
+    error_buffer[error_buffer_size -1]= 0;
   }
 
   bool has_filename= memcached_behavior_get(memc_ptr, MEMCACHED_BEHAVIOR_LOAD_FROM_FILE);
   if (memcached_success(rc) and has_filename)
   {
-    assert(memcached_parse_filename(memc_ptr));
-    assert(memcached_parse_filename_length(memc_ptr));
-    memcached_string_t filename= memcached_array_to_string(memc_ptr->configure.filename);
-    rc= _parse_file_options(memc_ptr, memc_ptr->configure.filename);
+    assert_msg(memcached_parse_filename(memc_ptr), "Invalid configuration file");
+    assert_msg(memcached_parse_filename_length(memc_ptr), "Invalid configuration file");
+    rc= _parse_file_options(*memc_ptr, memc_ptr->configure.filename);
 
-    if (memcached_failed(rc) and error_buffer && error_buffer_size)
+    if (memcached_failed(rc) and error_buffer and error_buffer_size)
     {
       strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
+      error_buffer[error_buffer_size -1]= 0;
     }
   }
 
@@ -132,53 +141,45 @@ memcached_return_t memcached_parse_configuration(memcached_st *self, char const
 
 void memcached_set_configuration_file(memcached_st *self, const char *filename, size_t filename_length)
 {
-  assert(filename);
-  assert(filename_length);
+  assert_msg(filename, "Invalid filename");
+  assert_msg(filename_length, "Invalid filename_length");
   memcached_array_free(self->configure.filename);
   self->configure.filename= memcached_strcpy(self, filename, filename_length);
 }
 
-memcached_return_t memcached_parse_configure_file(memcached_st *self, const char *filename, size_t length)
+memcached_return_t memcached_parse_configure_file(memcached_st& self, const char *filename, size_t length)
 {
-  WATCHPOINT_ASSERT(self);
-  if (not self)
-  {
-    return MEMCACHED_INVALID_ARGUMENTS;
-  }
-
-  WATCHPOINT_ASSERT(self);
   if (not filename)
   {
-    return memcached_set_error(*self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
   }
 
   WATCHPOINT_ASSERT(self);
   if (not length)
   {
-    return memcached_set_error(*self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
   }
 
-  memcached_array_st *tmp_array= memcached_strcpy(self, filename, length);
+  memcached_array_st *tmp_array= memcached_strcpy(&self, filename, length);
+
+  if (not tmp_array)
+  {
+    return memcached_set_error(self, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
+  }
 
-  memcached_return_t rc= memcached_parse_configure_file(self, tmp_array);
+  memcached_return_t rc= memcached_parse_configure_file(self, *tmp_array);
   memcached_array_free(tmp_array);
 
   return rc;
 }
 
-memcached_return_t memcached_parse_configure_file(memcached_st *self, memcached_array_st *filename)
+memcached_return_t memcached_parse_configure_file(memcached_st& self, memcached_array_st& filename)
 {
-  WATCHPOINT_ASSERT(self);
-  if (not self)
-  {
-    return MEMCACHED_INVALID_ARGUMENTS;
-  }
-
-  WATCHPOINT_ASSERT(memcached_array_size(filename));
-  if (not memcached_array_size(filename))
+  WATCHPOINT_ASSERT(memcached_array_size(&filename));
+  if (not memcached_array_size(&filename))
   {
-    return memcached_set_error(*self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
   }
 
-  return _parse_file_options(self, filename);
+  return _parse_file_options(self, &filename);
 }