Merge in more updates for docs (we are just going to check them all in so that users...

[awesomized/libmemcached] / libmemcached / string.c

diff --git a/libmemcached/string.c b/libmemcached/string.c
index 10a295814ddb9d8e1fd21d5218854041c0cd3016..b5badc5eff8bb23f970fdd9d5f262cd9ecb60324 100644 (file)
--- a/libmemcached/string.c
+++ b/libmemcached/string.c
@@ -75,7 +75,7 @@ memcached_string_st *memcached_string_create(const memcached_st *memc, memcached
 
     self->options.is_allocated= true;
   }
-  self->root= memc;
+  self->root= (memcached_st *)memc;
 
   _init_string(self);
 
@@ -84,7 +84,7 @@ memcached_string_st *memcached_string_create(const memcached_st *memc, memcached
   {
     if (rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE)
     {
-      ((memcached_st *)memc)->cached_errno= errno;
+      memcached_set_errno(self->root, errno, NULL);
     }
     libmemcached_free(memc, self);
 
@@ -212,12 +212,3 @@ void memcached_string_set_length(memcached_string_st *self, size_t length)
 {
   self->end= self->string + length;
 }
-
-memcached_string_t memcached_string_make(const char *str, size_t length)
-{
-  memcached_string_t tmp;
-  tmp.c_str= str;
-  tmp.size= length;
-
-  return tmp;
-}