Update from Padraig, one additional valgrind warning I found cleaned up

[m6w6/libmemcached] / libmemcached / memcached_get.h

diff --git a/libmemcached/memcached_get.h b/libmemcached/memcached_get.h
index 34db08936fefa20295afbab250b7a569e441ba81..bf3aeb5333728459bf243ee4af50c0daa13004bb 100644 (file)
--- a/libmemcached/memcached_get.h
+++ b/libmemcached/memcached_get.h
@@ -9,10 +9,6 @@
 #ifndef LIBMEMCACHED_MEMCACHED_GET_H
 #define LIBMEMCACHED_MEMCACHED_GET_H
 
-#ifndef LIBMEMCACHED_MEMCACHED_H
-#error "Please include <libmemcached/memcached.h> instead"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -27,7 +23,8 @@ char *memcached_get(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return memcached_mget(memcached_st *ptr, 
-                                const char **keys, size_t *key_length, 
+                                const char * const *keys, 
+                                const size_t *key_length, 
                                 size_t number_of_keys);
 
 LIBMEMCACHED_API
@@ -42,8 +39,8 @@ LIBMEMCACHED_API
 memcached_return memcached_mget_by_key(memcached_st *ptr, 
                                        const char *master_key, size_t 
                                        master_key_length,
-                                       const char **keys, 
-                                       size_t *key_length, 
+                                       const char * const *keys, 
+                                       const size_t *key_length, 
                                        size_t number_of_keys);
 
 LIBMEMCACHED_API
@@ -57,7 +54,25 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
                                             memcached_result_st *result,
                                             memcached_return *error);
 
+LIBMEMCACHED_API
+memcached_return memcached_mget_execute(memcached_st *ptr,
+                                        const char * const *keys,
+                                        const size_t *key_length,
+                                        size_t number_of_keys,
+                                        memcached_execute_function *callback,
+                                        void *context,
+                                        unsigned int number_of_callbacks);
 
+LIBMEMCACHED_API
+memcached_return memcached_mget_execute_by_key(memcached_st *ptr,
+                                               const char *master_key,
+                                               size_t master_key_length,
+                                               const char * const *keys,
+                                               const size_t *key_length,
+                                               size_t number_of_keys,
+                                               memcached_execute_function *callback,
+                                               void *context,
+                                               unsigned int number_of_callbacks);
 
 #ifdef __cplusplus
 }