First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_get.h

diff --git a/libmemcached/memcached_get.h b/libmemcached/memcached_get.h
index 7044442798ee5f2334323053f0d786e968a5d41a..bb04a15432f24ee2b4aead8e6d941a8be1506668 100644 (file)
--- a/libmemcached/memcached_get.h
+++ b/libmemcached/memcached_get.h
@@ -1,13 +1,16 @@
-/*
- * Summary: Get functions for libmemcached
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker 
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
  *
- * Copy: See Copyright for the status of this software.
+ * Summary: Get functions for libmemcached
  *
- * 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" {
@@ -19,12 +22,13 @@ char *memcached_get(memcached_st *ptr,
                     const char *key, size_t key_length,
                     size_t *value_length, 
                     uint32_t *flags,
-                    memcached_return *error);
+                    memcached_return_t *error);
 
 LIBMEMCACHED_API
-memcached_return memcached_mget(memcached_st *ptr, 
-                                const char **keys, size_t *key_length, 
-                                unsigned int number_of_keys);
+memcached_return_t memcached_mget(memcached_st *ptr, 
+                                  const char * const *keys, 
+                                  const size_t *key_length, 
+                                  size_t number_of_keys);
 
 LIBMEMCACHED_API
 char *memcached_get_by_key(memcached_st *ptr, 
@@ -32,31 +36,49 @@ char *memcached_get_by_key(memcached_st *ptr,
                            const char *key, size_t key_length, 
                            size_t *value_length, 
                            uint32_t *flags,
-                           memcached_return *error);
+                           memcached_return_t *error);
 
 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, 
-                                       unsigned int number_of_keys);
+memcached_return_t memcached_mget_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);
 
 LIBMEMCACHED_API
 char *memcached_fetch(memcached_st *ptr, 
                       char *key, size_t *key_length, 
                       size_t *value_length, uint32_t *flags, 
-                      memcached_return *error);
+                      memcached_return_t *error);
 
 LIBMEMCACHED_API
 memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
                                             memcached_result_st *result,
-                                            memcached_return *error);
+                                            memcached_return_t *error);
 
+LIBMEMCACHED_API
+memcached_return_t memcached_mget_execute(memcached_st *ptr,
+                                          const char * const *keys,
+                                          const size_t *key_length,
+                                          size_t number_of_keys,
+                                          memcached_execute_fn *callback,
+                                          void *context,
+                                          unsigned int number_of_callbacks);
 
+LIBMEMCACHED_API
+memcached_return_t 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_fn *callback,
+                                                 void *context,
+                                                 unsigned int number_of_callbacks);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __MEMCACHED_GET_H__ */
+#endif /* LIBMEMCACHED_MEMCACHED_GET_H */