Refactor to allow memcached_string_st to be public (and useable)

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 14a17076f45a1118bb1690ed7f2431b5c4d95953..288f421d4280b83072827f59041cab5c39cff574 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -99,10 +99,6 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
 #define memcached_server_response_decrement(A) (A)->cursor_active--
 #define memcached_server_response_reset(A) (A)->cursor_active=0
 
-/* String Struct */
-memcached_string_st *memcached_string_create(memcached_st *ptr,
-                                             memcached_string_st *string,
-                                             size_t initial_size);
 memcached_return memcached_do(memcached_server_st *ptr, char *commmand,
                               size_t command_length, uint8_t with_flush);
 memcached_return memcached_version(memcached_st *ptr);

diff --git a/libmemcached/memcached_string.h b/libmemcached/memcached_string.h
index 990c76ee2d0af6e861b521741e5c951b89d3a2a8..350d1b51c8321c9b98ca1a157c8326305bcc5593 100644 (file)
--- a/libmemcached/memcached_string.h
+++ b/libmemcached/memcached_string.h
@@ -27,6 +27,9 @@ struct memcached_string_st {
 #define memcached_string_size(A) (A)->current_size
 #define memcached_string_value(A) (A)->string
 
+memcached_string_st *memcached_string_create(memcached_st *ptr,
+                                             memcached_string_st *string,
+                                             size_t initial_size);
 memcached_return memcached_string_check(memcached_string_st *string, size_t need);
 char *memcached_string_c_copy(memcached_string_st *string);
 memcached_return memcached_string_append_character(memcached_string_st *string,

diff --git a/tests/function.c b/tests/function.c
index 76138d1b685d090f3cd809483d26db8cbb0f849e..bcf08fe6c8cdd54dd586830204b2ca2568c81b6a 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <time.h>
 #include "server.h"
-#include "../libmemcached/common.h"
 #include "../clients/generator.h"
 #include "../clients/execute.h"