X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions.cc;h=290cfc895b434c90868563ae37476237454dca84;hb=a713b6d9ee850ae5805c05e8336256cea1f71138;hp=55299559870855380443ea8a287beb007093209c;hpb=0ef2080bdbaafe7e3397530ac69ef4081f4f513e;p=m6w6%2Flibmemcached

diff --git a/libmemcached/options.cc b/libmemcached/options.cc
index 55299559..290cfc89 100644
--- a/libmemcached/options.cc
+++ b/libmemcached/options.cc
@@ -36,11 +36,13 @@
  */
 
 #include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
 
-#include <libmemcached/options/context.h>
+#include <libmemcached/csl/context.h>
 
 const char *memcached_parse_filename(memcached_st *memc)
 {
+  assert_msg(memc, "Invalid memcached_st");
   return memcached_array_string(memc->configure.filename);
 }
 
@@ -49,22 +51,15 @@ 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_string_t *filename)
+static memcached_return_t _parse_file_options(memcached_st& self, memcached_array_st *real_name)
 {
-  memcached_array_st *real_name= memcached_strcpy(self, filename->c_str, filename->size);
-
-  if (not real_name)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-
   FILE *fp= fopen(memcached_array_string(real_name), "r");
-  if (! fp)
+  if (not fp)
   {
     memcached_string_t error_message= memcached_array_to_string(real_name);
-    memcached_return_t rc=  memcached_set_errno(self, errno, &error_message);
-    memcached_array_free(real_name);
+    memcached_return_t rc=  memcached_set_errno(self, errno, MEMCACHED_AT, error_message);
     return rc;
   }
-  memcached_array_free(real_name);
 
   char buffer[BUFSIZ];
   memcached_return_t rc= MEMCACHED_INVALID_ARGUMENTS;
@@ -75,8 +70,7 @@ static memcached_return_t _parse_file_options(memcached_st *self, memcached_stri
     if (length == 1 and buffer[0] == '\n')
       continue;
 
-    rc= memcached_parse_configuration(self, buffer, length);
-    if (rc != MEMCACHED_SUCCESS)
+    if (memcached_failed(rc= memcached_parse_configuration(&self, buffer, length)))
       break;
   }
   fclose(fp);
@@ -88,26 +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 (! (memc_ptr= memcached_create(&memc)))
+  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 (rc != MEMCACHED_SUCCESS && 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;
   }
 
-  if (rc== MEMCACHED_SUCCESS && memcached_behavior_get(memc_ptr, MEMCACHED_BEHAVIOR_LOAD_FROM_FILE))
+  bool has_filename= memcached_behavior_get(memc_ptr, MEMCACHED_BEHAVIOR_LOAD_FROM_FILE);
+  if (memcached_success(rc) and has_filename)
   {
-    memcached_string_t filename= memcached_array_to_string(memc_ptr->configure.filename);
-    rc= _parse_file_options(memc_ptr, &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 (rc != MEMCACHED_SUCCESS && 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;
     }
   }
 
@@ -119,9 +126,9 @@ memcached_return_t libmemcached_check_configuration(const char *option_string, s
 memcached_return_t memcached_parse_configuration(memcached_st *self, char const *option_string, size_t length)
 {
   WATCHPOINT_ASSERT(self);
-  if (! self)
+  if (not self)
   {
-    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
+    return MEMCACHED_INVALID_ARGUMENTS;
   }
 
   memcached_return_t rc;
@@ -134,21 +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_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 filename_length)
+memcached_return_t memcached_parse_configure_file(memcached_st& self, const char *filename, size_t length)
 {
-  if (! self)
-    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
+  if (not filename)
+  {
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+  }
 
-  if (! filename || filename_length == 0)
-    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
-  
-  memcached_string_t tmp;
-  tmp.c_str= filename;
-  tmp.size= filename_length;
+  WATCHPOINT_ASSERT(self);
+  if (not length)
+  {
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+  }
+
+  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_array_free(tmp_array);
+
+  return rc;
+}
+
+memcached_return_t memcached_parse_configure_file(memcached_st& self, memcached_array_st& filename)
+{
+  WATCHPOINT_ASSERT(memcached_array_size(&filename));
+  if (not memcached_array_size(&filename))
+  {
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT);
+  }
 
-  return _parse_file_options(self, &tmp);
+  return _parse_file_options(self, &filename);
 }