Merge in updates to doc/build of memaslap.

[m6w6/libmemcached] / libmemcached / options.h

diff --git a/libmemcached/options.h b/libmemcached/options.h
index b1b9b92ad67271a4657afd22c3086a9b699b545d..893da2ac9346d8f441b94aeea1ed137e14b373bf 100644 (file)
--- a/libmemcached/options.h
+++ b/libmemcached/options.h
@@ -42,14 +42,30 @@ extern "C" {
 #endif
 
 LIBMEMCACHED_API
-  memcached_return_t memcached_check_options(const char *option_string, size_t length, const char *error_buffer, size_t error_buffer_size);
+  memcached_return_t libmemcached_check_configuration(const char *option_string, size_t length, char *error_buffer, size_t error_buffer_size);
 
-LIBMEMCACHED_API
-  memcached_return_t memcached_parse_options(memcached_st *ptr, const char *option_string, size_t length);
+LIBMEMCACHED_LOCAL
+  void memcached_set_configuration_file(memcached_st *self, const char *filename, size_t filename_length);
 
-LIBMEMCACHED_API
-  memcached_return_t memcached_parse_file_options(memcached_st *ptr, const char *filename);
+LIBMEMCACHED_LOCAL
+  memcached_return_t memcached_parse_configuration(memcached_st *ptr, const char *option_string, size_t length);
+
+LIBMEMCACHED_LOCAL
+  const char *memcached_parse_filename(memcached_st *memc);
+
+LIBMEMCACHED_LOCAL
+  size_t memcached_parse_filename_length(memcached_st *memc);
 
 #ifdef __cplusplus
 }
 #endif
+
+#ifdef __cplusplus
+
+LIBMEMCACHED_LOCAL
+  memcached_return_t memcached_parse_configure_file(memcached_st *self, const char *filename, size_t length);
+
+LIBMEMCACHED_LOCAL
+  memcached_return_t memcached_parse_configure_file(memcached_st *self, memcached_array_st *filename);
+
+#endif