X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions.cc;h=55299559870855380443ea8a287beb007093209c;hb=6e9731947eace4be83d553a242a44b36b3adcf22;hp=b404652ec5e97bd8ccd0e479a87ae3a5f3c420d7;hpb=5821867f93ad4e4e38909fb854d84c285782241b;p=awesomized%2Flibmemcached

diff --git a/libmemcached/options.cc b/libmemcached/options.cc
index b404652e..55299559 100644
--- a/libmemcached/options.cc
+++ b/libmemcached/options.cc
@@ -35,9 +35,7 @@
  *
  */
 
-#include "libmemcached/common.h"
-
-#include <iostream>
+#include <libmemcached/common.h>
 
 #include <libmemcached/options/context.h>
 
@@ -90,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;
 
@@ -119,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);