Merge in Ubuntu fixes.

[m6w6/libmemcached] / libmemcached / storage.h

diff --git a/libmemcached/storage.h b/libmemcached/storage.h
index 58edb4798176df60abbcf2d9f4370e820a31ef6a..0854f164decdd01c3e7c7474f8bfc72dfa8f6b87 100644 (file)
--- a/libmemcached/storage.h
+++ b/libmemcached/storage.h
@@ -1,16 +1,41 @@
-/* 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) 2006-2009 Brian Aker All rights reserved.
  *
- * Summary: Storage related functions, aka set, replace,..
+ *  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_STORAGE_H__
-#define __LIBMEMCACHED_STORAGE_H__
+#pragma once
 
 #include "libmemcached/memcached.h"
 
@@ -56,7 +81,7 @@ memcached_return_t memcached_cas(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return_t memcached_set_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,
                                         const char *value, size_t value_length,
                                         time_t expiration,
@@ -64,7 +89,7 @@ memcached_return_t memcached_set_by_key(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return_t memcached_add_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,
                                         const char *value, size_t value_length,
                                         time_t expiration,
@@ -72,7 +97,7 @@ memcached_return_t memcached_add_by_key(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return_t memcached_replace_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,
                                             const char *value, size_t value_length,
                                             time_t expiration,
@@ -80,7 +105,7 @@ memcached_return_t memcached_replace_by_key(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return_t memcached_prepend_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,
                                             const char *value, size_t value_length,
                                             time_t expiration,
@@ -88,7 +113,7 @@ memcached_return_t memcached_prepend_by_key(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return_t memcached_append_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,
                                            const char *value, size_t value_length,
                                            time_t expiration,
@@ -96,7 +121,7 @@ memcached_return_t memcached_append_by_key(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return_t memcached_cas_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,
                                         const char *value, size_t value_length,
                                         time_t expiration,
@@ -106,5 +131,3 @@ memcached_return_t memcached_cas_by_key(memcached_st *ptr,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __LIBMEMCACHED_STORAGE_H__ */