X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fget.h;h=32e4c5f3772f2005e2a19fe7b59fc00de7ab7e56;hb=635e02c96cff1d87c6c89853a8a157fd98db87e7;hp=bb04a15432f24ee2b4aead8e6d941a8be1506668;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=m6w6%2Flibmemcached

diff --git a/libmemcached/get.h b/libmemcached/get.h
index bb04a154..32e4c5f3 100644
--- a/libmemcached/get.h
+++ b/libmemcached/get.h
@@ -1,16 +1,42 @@
-/* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
- * All rights reserved.
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2010 Brian Aker All rights reserved.
  *
- * Summary: Get functions for libmemcached
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_GET_H
-#define LIBMEMCACHED_MEMCACHED_GET_H
+#pragma once
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,42 +44,44 @@ extern "C" {
 
 /* Public defines */
 LIBMEMCACHED_API
-char *memcached_get(memcached_st *ptr, 
+char *memcached_get(memcached_st *ptr,
                     const char *key, size_t key_length,
-                    size_t *value_length, 
+                    size_t *value_length,
                     uint32_t *flags,
                     memcached_return_t *error);
 
 LIBMEMCACHED_API
-memcached_return_t memcached_mget(memcached_st *ptr, 
-                                  const char * const *keys, 
-                                  const size_t *key_length, 
+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, 
-                           const char *master_key, size_t master_key_length, 
-                           const char *key, size_t key_length, 
-                           size_t *value_length, 
+char *memcached_get_by_key(memcached_st *ptr,
+                           const char *group_key, size_t group_key_length,
+                           const char *key, size_t key_length,
+                           size_t *value_length,
                            uint32_t *flags,
                            memcached_return_t *error);
 
 LIBMEMCACHED_API
-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);
+memcached_return_t memcached_mget_by_key(memcached_st *ptr,
+                                         const char *group_key,
+                                         size_t group_key_length,
+                                         const char * const *keys,
+                                         const size_t *key_length,
+                                         const 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, 
+char *memcached_fetch(memcached_st *ptr,
+                      char *key,
+                      size_t *key_length,
+                      size_t *value_length,
+                      uint32_t *flags,
                       memcached_return_t *error);
 
 LIBMEMCACHED_API
-memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
+memcached_result_st *memcached_fetch_result(memcached_st *ptr,
                                             memcached_result_st *result,
                                             memcached_return_t *error);
 
@@ -61,24 +89,22 @@ 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,
+                                          const size_t number_of_keys,
                                           memcached_execute_fn *callback,
                                           void *context,
-                                          unsigned int number_of_callbacks);
+                                          const uint32_t 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 *group_key,
+                                                 size_t group_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);
+                                                 const uint32_t number_of_callbacks);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* LIBMEMCACHED_MEMCACHED_GET_H */