Merged from Padraig.

diff --git a/ChangeLog b/ChangeLog
index 5adef907c94504b789c4fc2b13fb690294abbd86..57659935efd828feb7e0c530ff8dfe9444a55a83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-0.31 Wed Jul  8 15:46:34 PDT 2009
+0.31 Fri Jul 10 09:02:50 PDT 2009
   * Added support or HA via replication.
   * malloc() removed for server key usage.
   * Update build system.

diff --git a/clients/memstat.c b/clients/memstat.c
index 817b9f6d1191d30cf2f2ae72aa65366b6a02e228..27c34a41c2caf4ad048c3bb4f8320cfe5950142a 100644 (file)
--- a/clients/memstat.c
+++ b/clients/memstat.c
@@ -19,9 +19,9 @@
 
 /* Prototypes */
 static void options_parse(int argc, char *argv[]);
-static void run_analyzer(memcached_st *memc, memcached_stat_st *stat,
+static void run_analyzer(memcached_st *memc, memcached_stat_st *memc_stat,
                          memcached_server_st *server_list);
-static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
+static void print_server_listing(memcached_st *memc, memcached_stat_st *memc_stat,
                                  memcached_server_st *server_list);
 static void print_analysis_report(memcached_st *memc,
                                   memcached_analysis_st *report,

diff --git a/configure.ac b/configure.ac
index ea826cc57ae00eed797986dc1aa27c3ccfac5d55..7b14a248b0e0a9fe0d826c5300b5686243aec7bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.30],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.31],[http://tangent.org/552/libmemcached.html])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 1293eefbbe1db6db97a331fb6c497906ce58d3de..c3b436bf2ff721481d5e1bf41de99f01d433ced4 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 #define MEMCACHED_VERSION_STRING_LENGTH 24
-#define LIBMEMCACHED_VERSION_STRING "0.30"
+#define LIBMEMCACHED_VERSION_STRING "0.31"
 
 struct memcached_analysis_st {
   uint32_t average_item_size;
@@ -163,7 +163,7 @@ void memcached_stat_free(memcached_st *, memcached_stat_st *);
 LIBMEMCACHED_API
 memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
 LIBMEMCACHED_API
-memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, 
+memcached_return memcached_stat_servername(memcached_stat_st *memc_stat, char *args, 
                                            char *hostname, unsigned int port);
 LIBMEMCACHED_API
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
@@ -235,10 +235,10 @@ LIBMEMCACHED_API
 memcached_server_st *memcached_servers_parse(const char *server_strings);
 
 LIBMEMCACHED_API
-char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, 
+char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat, 
                                const char *key, memcached_return *error);
 LIBMEMCACHED_API
-char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, 
+char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat, 
                                 memcached_return *error);
 
 LIBMEMCACHED_API

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index fa79df8f65ca4df2e90d013e85b78a1339ddb0b5..8076877e0ef84074d2e551c724a7aef4520b1e93 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -73,7 +73,7 @@ void memcached_server_free(memcached_server_st *ptr);
 LIBMEMCACHED_API
 memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);
 LIBMEMCACHED_API
-memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *stat,
+memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *memc_stat,
                                          memcached_return *error);
 
 LIBMEMCACHED_API