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 5535f34530bf2731b9a7c601f678d469c6d54e9d..bf3aeb5333728459bf243ee4af50c0daa13004bb 100644 (file)
--- a/libmemcached/memcached_get.h
+++ b/libmemcached/memcached_get.h
@@ -6,24 +6,28 @@
  * Author: Brian Aker
  */
 
-#ifndef __MEMCACHED_GET_H__
-#define __MEMCACHED_GET_H__
+#ifndef LIBMEMCACHED_MEMCACHED_GET_H
+#define LIBMEMCACHED_MEMCACHED_GET_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Public defines */
+LIBMEMCACHED_API
 char *memcached_get(memcached_st *ptr, 
                     const char *key, size_t key_length,
                     size_t *value_length, 
                     uint32_t *flags,
                     memcached_return *error);
 
+LIBMEMCACHED_API
 memcached_return memcached_mget(memcached_st *ptr, 
-                                char **keys, size_t *key_length, 
-                                unsigned int number_of_keys);
+                                const char * const *keys, 
+                                const size_t *key_length, 
+                                size_t number_of_keys);
 
+LIBMEMCACHED_API
 char *memcached_get_by_key(memcached_st *ptr, 
                            const char *master_key, size_t master_key_length, 
                            const char *key, size_t key_length, 
@@ -31,26 +35,47 @@ char *memcached_get_by_key(memcached_st *ptr,
                            uint32_t *flags,
                            memcached_return *error);
 
+LIBMEMCACHED_API
 memcached_return memcached_mget_by_key(memcached_st *ptr, 
                                        const char *master_key, size_t 
                                        master_key_length,
-                                       char **keys, 
-                                       size_t *key_length, 
-                                       unsigned int number_of_keys);
+                                       const char * const *keys, 
+                                       const size_t *key_length, 
+                                       size_t number_of_keys);
 
+LIBMEMCACHED_API
 char *memcached_fetch(memcached_st *ptr, 
                       char *key, size_t *key_length, 
                       size_t *value_length, uint32_t *flags, 
                       memcached_return *error);
 
+LIBMEMCACHED_API
 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
 }
 #endif
 
-#endif /* __MEMCACHED_GET_H__ */
+#endif /* LIBMEMCACHED_MEMCACHED_GET_H */