From: Brian Aker <brian@tangent.org>
Date: Thu, 7 Apr 2011 23:35:32 +0000 (-0700)
Subject: Cleanup the API, remove a couple of things we are not using.
X-Git-Tag: 0.51~15^2~22
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=21f1af1f3ec10b098a3b0edde94425cc4c9ba65c;p=m6w6%2Flibmemcached

Cleanup the API, remove a couple of things we are not using.
---

diff --git a/libmemcached/options.h b/libmemcached/options.h
index 0a27be98..85fb8502 100644
--- a/libmemcached/options.h
+++ b/libmemcached/options.h
@@ -47,13 +47,13 @@ LIBMEMCACHED_API
 LIBMEMCACHED_API
   memcached_return_t memcached_parse_configuration(memcached_st *ptr, const char *option_string, size_t length);
 
-LIBMEMCACHED_API
-  memcached_return_t memcached_parse_configure_file(memcached_st *ptr, const char *filename, size_t filename_length);
-
 LIBMEMCACHED_API
   void memcached_set_configuration_file(memcached_st *self, const char *filename, size_t filename_length);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
+  memcached_return_t memcached_parse_configure_file(memcached_st *ptr, const char *filename, size_t filename_length);
+
+LIBMEMCACHED_LOCAL
   const char *memcached_parse_filename(memcached_st *memc);
 
 LIBMEMCACHED_LOCAL
diff --git a/tests/parser.cc b/tests/parser.cc
index c7b7dc09..b4c9f058 100644
--- a/tests/parser.cc
+++ b/tests/parser.cc
@@ -336,8 +336,8 @@ test_return_t memcached_parse_configure_file_test(memcached_st*)
 
   test_true(memc_ptr);
 
-  memcached_return_t rc= memcached_parse_configure_file(memc_ptr, memcached_string_with_size(SUPPORT_EXAMPLE_CNF));
-  test_true_got(rc == MEMCACHED_SUCCESS, memcached_last_error_message(memc_ptr) ? memcached_last_error_message(memc_ptr) : memcached_strerror(NULL, rc));
+  memcached_set_configuration_file(memc_ptr, memcached_string_with_size(SUPPORT_EXAMPLE_CNF));
+  memcached_reset(memc_ptr);
   memcached_free(memc_ptr);
 
   return TEST_SUCCESS;