Allocation fixes in string library (now we can run bigger tests!)

[m6w6/libmemcached] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index f8565be7cf36030bfc20d26cf744d6417082b36f..1f6f678e32db0ee2023abbce4e1124ec0b0468d2 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -5,8 +5,24 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <limits.h>
+#include <assert.h>
+#include <time.h>
+#include <errno.h>
+
+
 #include <memcached.h>
-#include <memcached_io.h>
+#include "memcached_io.h"
 
 #include <libmemcached_config.h>
 
@@ -37,4 +53,20 @@ void memcached_quit_server(memcached_st *ptr, unsigned int server_key);
 #define memcached_server_response_increment(A,B) A->hosts[B].stack_responses++
 #define memcached_server_response_decrement(A,B) A->hosts[B].stack_responses--
 
+/* String Struct */
+#define memcached_string_length(A, B) (size_t)(B->end - B->string)
+#define memcached_string_size(A, B) B->current_size
+#define memcached_string_value(A, B) B->string
+
+memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_size);
+memcached_return memcached_string_append_character(memcached_st *ptr, 
+                                                   memcached_string_st *string, 
+                                                   char character);
+memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st *string,
+                                         char *value, size_t length);
+size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string, size_t remove);
+memcached_return memcached_string_reset(memcached_st *ptr, memcached_string_st *string);
+void memcached_string_free(memcached_st *ptr, memcached_string_st *string);
+
+
 #endif /* __COMMON_H__ */