Merge in bug fix for lp:779837

[awesomized/libmemcached] / libmemcached / get.h

diff --git a/libmemcached/get.h b/libmemcached/get.h
index a6d6b264498e79e102b456fa66548ccc6a9c23af..32e4c5f3772f2005e2a19fe7b59fc00de7ab7e56 100644 (file)
--- 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_GET_H__
-#define __LIBMEMCACHED_GET_H__
+#pragma once
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,7 +58,7 @@ memcached_return_t memcached_mget(memcached_st *ptr,
 
 LIBMEMCACHED_API
 char *memcached_get_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 *key, size_t key_length,
                            size_t *value_length,
                            uint32_t *flags,
@@ -40,8 +66,8 @@ char *memcached_get_by_key(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return_t memcached_mget_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,
                                          const size_t number_of_keys);
@@ -70,8 +96,8 @@ memcached_return_t memcached_mget_execute(memcached_st *ptr,
 
 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,
@@ -82,5 +108,3 @@ memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __LIBMEMCACHED_GET_H__ */