Merge in all updates.

[awesomized/libmemcached] / libmemcached / options.cc

diff --git a/libmemcached/options.cc b/libmemcached/options.cc
index 02b885fca60e69e6f6efd54c1bea381c874c352b..55299559870855380443ea8a287beb007093209c 100644 (file)
--- a/libmemcached/options.cc
+++ b/libmemcached/options.cc
@@ -35,9 +35,7 @@
  *
  */
 
-#include "common.h"
-
-#include <iostream>
+#include <libmemcached/common.h>
 
 #include <libmemcached/options/context.h>
 
@@ -53,15 +51,20 @@ size_t memcached_parse_filename_length(memcached_st *memc)
 
 static memcached_return_t _parse_file_options(memcached_st *self, memcached_string_t *filename)
 {
-  std::string real_name(filename->c_str, filename->size);
-  FILE *fp= fopen(real_name.c_str(), "r");
+  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)
   {
-    memcached_string_t tmp;
-    tmp.c_str= real_name.c_str();
-    tmp.size= real_name.size();
-    return memcached_set_errno(self, errno, &tmp);
+    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);
+    return rc;
   }
+  memcached_array_free(real_name);
 
   char buffer[BUFSIZ];
   memcached_return_t rc= MEMCACHED_INVALID_ARGUMENTS;
@@ -85,6 +88,9 @@ memcached_return_t libmemcached_check_configuration(const char *option_string, s
 {
   memcached_st memc, *memc_ptr;
 
+  if (error_buffer_size)
+    error_buffer[0]= 0;
+
   if (! (memc_ptr= memcached_create(&memc)))
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
 
@@ -114,7 +120,9 @@ memcached_return_t memcached_parse_configuration(memcached_st *self, char const
 {
   WATCHPOINT_ASSERT(self);
   if (! self)
+  {
     return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
+  }
 
   memcached_return_t rc;
   Context context(option_string, length, self, rc);