Merge in additional documentation updates.

[awesomized/libmemcached] / libmemcached / options.cc

diff --git a/libmemcached/options.cc b/libmemcached/options.cc
index 02b885fca60e69e6f6efd54c1bea381c874c352b..b404652ec5e97bd8ccd0e479a87ae3a5f3c420d7 100644 (file)
--- a/libmemcached/options.cc
+++ b/libmemcached/options.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include "common.h"
+#include "libmemcached/common.h"
 
 #include <iostream>
 
@@ -53,15 +53,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;