X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.h;h=f37d50fc253c265386b9579e7f2f287ff9833651;hb=3e4c141a6b0ec12b668143a26ecf01da5c151931;hp=aa1b23dc8fd2075053ed841393df1e0011007969;hpb=1f5cf20c75c7187df1d648a5a200b52db3f17db1;p=awesomized%2Flibmemcached

diff --git a/libmemcached/auto.h b/libmemcached/auto.h
index aa1b23dc..f37d50fc 100644
--- a/libmemcached/auto.h
+++ b/libmemcached/auto.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: Change the behavior of the memcached connection.
+ *  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_AUTO_H__
-#define __LIBMEMCACHED_AUTO_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,14 +54,14 @@ LIBMEMCACHED_API
 
 LIBMEMCACHED_API
   memcached_return_t memcached_increment_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,
                                                 uint64_t offset,
                                                 uint64_t *value);
 
 LIBMEMCACHED_API
   memcached_return_t memcached_decrement_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,
                                                 uint64_t offset,
                                                 uint64_t *value);
@@ -61,8 +86,8 @@ LIBMEMCACHED_API
 
 LIBMEMCACHED_API
   memcached_return_t memcached_increment_with_initial_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,
                                                              uint64_t offset,
@@ -72,8 +97,8 @@ LIBMEMCACHED_API
 
 LIBMEMCACHED_API
   memcached_return_t memcached_decrement_with_initial_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,
                                                              uint64_t offset,
@@ -84,5 +109,3 @@ LIBMEMCACHED_API
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __LIBMEMCACHED_AUTO_H__ */