Updated copyright headers.

diff --git a/AUTHORS b/AUTHORS
index 24dbad1dfc11e0ea59c622306f480d1975ecb1aa..6e740f9612c8d836634dce38e07da64ccb9b2d8f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,3 +8,4 @@ Yin Chen, -- Ketama Work
 Toru Maesaka, dev@torum.net -- Stats analysis
 Eric Lambert, -- UDP work
 Monty Taylor, -- Build Releated (Pandora)
+Mingqiang Zhuang, Schooner Information Technology, Inc. -- Rewrite of memslap

diff --git a/clients/client_options.h b/clients/client_options.h
index a4f0f47fa29130cdd575f71c29d8b4da2be52e05..955bcd18ff8bb959e70d1a4b8bd32a0bca2d44b0 100644 (file)
--- a/clients/client_options.h
+++ b/clients/client_options.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #ifndef __CLIENT_OPTIONS_H__
 #define __CLIENT_OPTIONS_H__
 

diff --git a/clients/execute.c b/clients/execute.c
index 3944d449b58b06c64ecc52d1ebeb4407b6c5c59b..130fef0b67919e1c7290ddb0fafff7d7d464023a 100644 (file)
--- a/clients/execute.c
+++ b/clients/execute.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /*
   Execute a memcached_set() a set of pairs.
   Return the number of rows set.

diff --git a/clients/execute.h b/clients/execute.h
index 7a2c5511704b3e237ff0139edc6ad326560875c5..ba54d8d2947294eff86dfb2e79088ad4ee7dbb12 100644 (file)
--- a/clients/execute.h
+++ b/clients/execute.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #ifndef CLIENTS_EXECUTE_H
 #define CLIENTS_EXECUTE_H
 #include "libmemcached/memcached.h"

diff --git a/clients/generator.c b/clients/generator.c
index 5bce0301ab6ae848f9315ea5b85c186210c8f30a..2af06010613e62a4ac50a09bca2dd5bf5464bb51 100644 (file)
--- a/clients/generator.c
+++ b/clients/generator.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 
 #include <stdio.h>

diff --git a/clients/generator.h b/clients/generator.h
index 4897e943426746967243efd46cb7e3e679a17b89..196e71b2728c3d0cd867f00d059413948d5a9fb0 100644 (file)
--- a/clients/generator.h
+++ b/clients/generator.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /*
   Code to generate data to be pushed into memcached
 */

diff --git a/clients/memcapable.c b/clients/memcapable.c
index f1d7d6a4d7330f8b91e969fe951870b35a98dc38..c70afa33237687c55a09258ce3d954d46b016b12 100644 (file)
--- a/clients/memcapable.c
+++ b/clients/memcapable.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 #undef NDEBUG
 #include "config.h"

diff --git a/clients/memcat.c b/clients/memcat.c
index 9ea6f33b23c7decdcf5bdd060a5a4f824ca2b9d5..2f46ee901792a7e119dae7be714edf8884c1b4ca 100644 (file)
--- a/clients/memcat.c
+++ b/clients/memcat.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <inttypes.h>

diff --git a/clients/memcp.c b/clients/memcp.c
index bdab6b096692e4a00d9197764273a531fc5f0b84..d9594d78c8e8d55e6f554af03dac707b3b773c39 100644 (file)
--- a/clients/memcp.c
+++ b/clients/memcp.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/clients/memdump.c b/clients/memdump.c
index 4705bcaddbf13c8fed7431ab56725759500c0412..582939fab52eef989fcb0ca35dd162c42996f6b1 100644 (file)
--- a/clients/memdump.c
+++ b/clients/memdump.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/clients/memerror.c b/clients/memerror.c
index fbad55ba2f00245d2182bcbda522ee20c3428647..24798a00c3dc7d592bcfa2d50df7721a6b280e77 100644 (file)
--- a/clients/memerror.c
+++ b/clients/memerror.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <inttypes.h>

diff --git a/clients/memflush.c b/clients/memflush.c
index bc12ae8d275489831f99f8fc316af5896aa1e066..885aa6c85089708dcabd6058c58ee20f90e1c9da 100644 (file)
--- a/clients/memflush.c
+++ b/clients/memflush.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <unistd.h>

diff --git a/clients/memrm.c b/clients/memrm.c
index 1a616482d424c9d835424b917bbbe189cbd1e915..e7525fd5b6912edb438001eb379b4eed98d3c5e4 100644 (file)
--- a/clients/memrm.c
+++ b/clients/memrm.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <unistd.h>

diff --git a/clients/memstat.c b/clients/memstat.c
index 8e00775336f5d727ae8ecc0b7239a103d5a5659a..c8769d52059e0a601723b00770ca6f936a9780a8 100644 (file)
--- a/clients/memstat.c
+++ b/clients/memstat.c
@@ -1,3 +1,17 @@
+/* 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.
+ *
+ * Summary:
+ *
+ * Authors: 
+ *          Brian Aker
+ *          Toru Maesaka
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/clients/ms_atomic.h b/clients/ms_atomic.h
index c833ea8b991fc38ceb5d057bcbb3c942ae0f7956..ca117df834a3f6a1bf0d8681138e0513e238cced 100644 (file)
--- a/clients/ms_atomic.h
+++ b/clients/ms_atomic.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #ifndef CLIENTS_MS_ATOMIC_H
 #define CLIENTS_MS_ATOMIC_H
 

diff --git a/clients/utilities.c b/clients/utilities.c
index 53a366b2852cc493821c6c9de7336c0aba65a731..0c286b70e1b3c76fddee058989fdd6be747bfb98 100644 (file)
--- a/clients/utilities.c
+++ b/clients/utilities.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <ctype.h>

diff --git a/clients/utilities.h b/clients/utilities.h
index 7ca92497ccbb3b855349dc358712d38c355589fd..f55997a5852eb754605693100ae2482aa4cc422c 100644 (file)
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include <getopt.h>
 #include <libmemcached/memcached.h>
 #include "client_options.h"

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index 66c142bfbb64c1c73e031bb54ed024f723ea5862..80db35050fa0fc9c4dd37f5fd60633ee43c427a3 100644 (file)
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -22,6 +22,7 @@ pkginclude_HEADERS= memcached.h \
                    memcached.hpp \
                    exception.hpp \
                    memcached_behavior.h \
+                   memcached_callback.h \
                     memcached_configure.h \
                    memcached_constants.h \
                    memcached_get.h \

diff --git a/libmemcached/byteorder.c b/libmemcached/byteorder.c
index 24f8e8c6e88e1e13be7595325dd51c7f8b266c76..4b6eeb07acbeafaf2ea54107f15e824dcf47ed73 100644 (file)
--- a/libmemcached/byteorder.c
+++ b/libmemcached/byteorder.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include "byteorder.h"
 
 /* Byte swap a 64-bit number. */

diff --git a/libmemcached/byteorder.h b/libmemcached/byteorder.h
index 99e9f5d196f52e7df4af6b617d2798e5fed3b04a..17e66a78f59e0d52ee235b9a08dc53af26cd618e 100644 (file)
--- a/libmemcached/byteorder.h
+++ b/libmemcached/byteorder.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #ifndef LIBMEMCACHED_BYTEORDER_H
 #define LIBMEMCACHED_BYTEORDER_H
 

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 596accaa877bc5293b0c4e9b49f09323dec63a1e..3a08ffca2fc301643d08cbcd7f28d68c924b7f7f 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /*
   Common include file for libmemached
 */

diff --git a/libmemcached/libmemcached_probes.h b/libmemcached/libmemcached_probes.h
index b441a04738000f55fe4d83f81138d1fbc5b07cfd..ddc9ef4793198b587f55177c34117d680974d440 100644 (file)
--- a/libmemcached/libmemcached_probes.h
+++ b/libmemcached/libmemcached_probes.h
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /*
  * This file contains the definition of the various probes supported by
  * libmemcached. Currently it only support DTRACE, but just create an

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index a79e27ed2b051ad6cec49c0e8c6e43090ae1fda1..119c4607d589b1e9a3480f4c6d9240a7d872c990 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -28,6 +28,7 @@
 #include <libmemcached/memcached_constants.h>
 #include <libmemcached/memcached_types.h>
 #include <libmemcached/memcached_behavior.h>
+#include <libmemcached/memcached_callback.h>
 #include <libmemcached/memcached_get.h>
 #include <libmemcached/memcached_server.h>
 #include <libmemcached/memcached_string.h>
@@ -321,15 +322,6 @@ memcached_return_t memcached_fetch_execute(memcached_st *ptr,
                                            void *context,
                                            unsigned int number_of_callbacks);
 
-LIBMEMCACHED_API
-memcached_return_t memcached_callback_set(memcached_st *ptr,
-                                          memcached_callback_t flag,
-                                          void *data);
-LIBMEMCACHED_API
-void *memcached_callback_get(memcached_st *ptr,
-                             memcached_callback_t flag,
-                             memcached_return_t *error);
-
 LIBMEMCACHED_API
 memcached_return_t memcached_dump(memcached_st *ptr, memcached_dump_fn *function, void *context, uint32_t number_of_callbacks);
 

diff --git a/libmemcached/memcached_callback.c b/libmemcached/memcached_callback.c
index 618bedf42aac9e54cc94e44488229035c06506fd..b0ddfc2ba0d394c311ba9c39f39c1703cc6a2d97 100644 (file)
--- a/libmemcached/memcached_callback.c
+++ b/libmemcached/memcached_callback.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary: Change any of the possible callbacks.
+ *
+ */
+
 #include "common.h" 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -65,19 +76,19 @@ memcached_return_t memcached_callback_set(memcached_st *ptr,
 #ifdef MEMCACHED_ENABLE_DEPRECATED
   case MEMCACHED_CALLBACK_MALLOC_FUNCTION:
     {
-      memcached_malloc_function func= *(memcached_malloc_function *)&data;
+      memcached_malloc_function func= *(memcached_malloc_fn *)&data;
       ptr->call_malloc= func;
       break;
     }
   case MEMCACHED_CALLBACK_REALLOC_FUNCTION:
     {
-      memcached_realloc_function func= *(memcached_realloc_function *)&data;
+      memcached_realloc_function func= *(memcached_realloc_fn *)&data;
       ptr->call_realloc= func;
       break;
     }
   case MEMCACHED_CALLBACK_FREE_FUNCTION:
     {
-      memcached_free_function func= *(memcached_free_function *)&data;
+      memcached_free_function func= *(memcached_free_fn *)&data;
       ptr->call_free= func;
       break;
     }

diff --git a/libmemcached/memcached_constants.h b/libmemcached/memcached_constants.h
index 09c6040ce873695cbef1cd9d2b9adc899787d672..cbdbf4b58467c82b89c6c2ffd6b21688b35bbf48 100644 (file)
--- a/libmemcached/memcached_constants.h
+++ b/libmemcached/memcached_constants.h
@@ -1,9 +1,12 @@
-/*
- * Summary: Constants 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: Constants for libmemcached
  *
- * Author: Brian Aker
  */
 
 #ifndef __MEMCACHED_CONSTANTS_H__

diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c
index 094c65b8879e701b6d28ab0e7486e1e97c541129..27a1410e51c4f7fbc6d3aacabce7cb412f002ba1 100644 (file)
--- a/libmemcached/memcached_get.c
+++ b/libmemcached/memcached_get.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary: Get functions for libmemcached
+ *
+ */
+
 #include "common.h"
 #include "memcached_io.h"
 

diff --git a/libmemcached/memcached_get.h b/libmemcached/memcached_get.h
index 905f98574140216b43e769a33a63b52388fb098e..bb04a15432f24ee2b4aead8e6d941a8be1506668 100644 (file)
--- a/libmemcached/memcached_get.h
+++ b/libmemcached/memcached_get.h
@@ -1,9 +1,12 @@
-/*
- * 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 LIBMEMCACHED_MEMCACHED_GET_H

diff --git a/libmemcached/memcached_internal.h b/libmemcached/memcached_internal.h
index 52fb4c1f90989332e459e2a041a05e2118fa9d20..3e4415ddea34b5d20cd12e16d57a13b2748d8b75 100644 (file)
--- a/libmemcached/memcached_internal.h
+++ b/libmemcached/memcached_internal.h
@@ -1,8 +1,12 @@
-/*
+/* 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.
+ *
  * Summary: Internal functions used by the library. Not for public use!
- * Copy: See Copyright for the status of this software.
  *
- * Author: Trond Norbye
  */
 
 #ifndef LIBMEMCACHED_MEMCACHED_INTERNAL_H

diff --git a/libmemcached/memcached_io.c b/libmemcached/memcached_io.c
index fe534c908cf04bed04051208ff11d221e05d4f38..fd86437fd670153e15cb67b75ca4ebc32f13aea2 100644 (file)
--- a/libmemcached/memcached_io.c
+++ b/libmemcached/memcached_io.c
@@ -1,6 +1,14 @@
-/*
-  Basic socket buffered IO
-*/
+/* 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.
+ *
+ * Summary: Server IO, Not public!
+ *
+ */
+
 
 #include "common.h"
 #include "memcached_io.h"

diff --git a/libmemcached/memcached_pool.h b/libmemcached/memcached_pool.h
index 967d768d9b8bedc4a63d9a7e7a2dc1a48e30f095..84dab3dd1732cff384df3e9aedecfb454e47f82a 100644 (file)
--- a/libmemcached/memcached_pool.h
+++ b/libmemcached/memcached_pool.h
@@ -1,11 +1,15 @@
-/*
- * Summary: Connection pool implementation 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: Connection pool implementation for libmemcached.
  *
- * Author: Trond Norbye
  */
 
+
 #ifndef MEMCACHED_POOL_H
 #define MEMCACHED_POOL_H
 

diff --git a/libmemcached/memcached_result.c b/libmemcached/memcached_result.c
index 6427f1df4590812c70043c066792508a0e119500..14a0774e3eb3b9e4b9ec4a5f7a4fcb5895d5eaad 100644 (file)
--- a/libmemcached/memcached_result.c
+++ b/libmemcached/memcached_result.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary: Functions to manipulate the result structure.
+ *
+ */
+
 /* 
   memcached_result_st are used to internally represent the return values from
   memcached. We use a structure so that long term as identifiers are added 

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index aeea59cce270d7a332ff83ffef96fe1965103897..4b0c12e51369cd4363529c65c14eee4bd2ca6833 100644 (file)
--- a/libmemcached/memcached_result.h
+++ b/libmemcached/memcached_result.h
@@ -1,9 +1,12 @@
-/*
- * Summary: Result structure used for libmemcached.
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker 
+ * All rights reserved.
  *
- * Copy: See Copyright for the status of this software.
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Functions to manipulate the result structure.
  *
- * Author: Brian Aker
  */
 
 #ifndef __MEMCACHED_RESULT_H__

diff --git a/libmemcached/memcached_server.c b/libmemcached/memcached_server.c
index 5a94e767b38c6bb618c4b3789975403ff6db2723..2cff36da2eedf007a0c3d163137a2cf169151b77 100644 (file)
--- a/libmemcached/memcached_server.c
+++ b/libmemcached/memcached_server.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary: String structure used for libmemcached.
+ *
+ */
+
 /*
   This is a partial implementation for fetching/creating memcached_server_st objects.
 */

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index e0fc7ea14ba4b7a25ad672ac08fbb535b76389de..f2d92dc1249517776ed1c34d6e1a7d187c5ab62c 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -1,9 +1,12 @@
-/*
- * Summary: String structure used 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: String structure used for libmemcached.
  *
- * Author: Brian Aker
  */
 
 #ifndef __MEMCACHED_SERVER_H__

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index 2dbcb28071b624786a2f9e1c585f731ae90d7a30..c6a556f90d30ca9bcc57591858a584e48501d1e1 100644 (file)
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -1,11 +1,14 @@
-/*
-  Memcached library
+/* 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.
+ *
+ * Summary: Storage related functions, aka set, replace,..
+ *
+ */
 
-  memcached_set()
-  memcached_replace()
-  memcached_add()
-
-*/
 #include "common.h"
 #include "memcached_io.h"
 

diff --git a/libmemcached/memcached_storage.h b/libmemcached/memcached_storage.h
index 472a260a8b1ff6b3a22d57d101e2c590bdaafd7c..d4f4995c17dd37a3a31d8e09b6e1d12f2ee3045f 100644 (file)
--- a/libmemcached/memcached_storage.h
+++ b/libmemcached/memcached_storage.h
@@ -1,9 +1,12 @@
-/*
- * Summary: Storage functions for libmemcached
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker 
+ * All rights reserved.
  *
- * Copy: See Copyright for the status of this software.
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Storage related functions, aka set, replace,..
  *
- * Author: Brian Aker
  */
 
 #ifndef __MEMCACHED_STORAGE_H__

diff --git a/libmemcached/memcached_string.c b/libmemcached/memcached_string.c
index a12d6d968b2ac530247228e699f6bfc5746c0fe9..838ca416681ffbff66b2658fb5abe3be03672174 100644 (file)
--- a/libmemcached/memcached_string.c
+++ b/libmemcached/memcached_string.c
@@ -5,6 +5,8 @@
  * Use and distribution licensed under the BSD license.  See
  * the COPYING file in the parent directory for full text.
  *
+ * Summary: String structure used for libmemcached.
+ *
  */
 
 #include "common.h"

diff --git a/libmemcached/memcached_util.h b/libmemcached/memcached_util.h
index 65732c87f438919738c9cfd170b4a19da11a7650..f06804b40d1ecffe1238443df8b06fd39a82f9af 100644 (file)
--- a/libmemcached/memcached_util.h
+++ b/libmemcached/memcached_util.h
@@ -1,12 +1,17 @@
-/*
- * Summary: interface for libmemcached utility library
- * Description: main include file for libmemcachedutil
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker 
+ * All rights reserved.
  *
- * Copy: See Copyright for the status of this software.
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Connection pool library.
  *
  * Author: Trond Norbye
+ *
  */
 
+
 #ifndef MEMCACHED_UTIL_H
 #define MEMCACHED_UTIL_H
 

diff --git a/libmemcached/memcached_watchpoint.h b/libmemcached/memcached_watchpoint.h
index d7f759fd6d14622eaf729338ddef804be3812e7a..d8c593ec595cce88e30bf1ff58aaf3d9bc9c1b4a 100644 (file)
--- a/libmemcached/memcached_watchpoint.h
+++ b/libmemcached/memcached_watchpoint.h
@@ -1,9 +1,12 @@
-/*
- * Summary: Localized copy of WATCHPOINT debug symbols
+/* 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: Localized copy of WATCHPOINT debug symbols
  *
- * Author: Brian Aker
  */
 
 #ifndef LIBMEMCACHED_MEMCACHED_WATCHPOINT_H

diff --git a/libmemcached/protocol_handler.h b/libmemcached/protocol_handler.h
index fe92a2cc1f75632a8121424fdd6476b2d436b283..5a820d4f1d9a77609581cd65c34fd6db4cf5fc97 100644 (file)
--- a/libmemcached/protocol_handler.h
+++ b/libmemcached/protocol_handler.h
@@ -1,10 +1,16 @@
-/*
- * Summary: Definition of the callback interface to the protocol handler
+/* 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: Definition of the callback interface to the protocol handler
  *
  * Author: Trond Norbye
+ *
  */
+
 #ifndef MEMCACHED_PROTOCOL_H
 #define MEMCACHED_PROTOCOL_H
 

diff --git a/libmemcached/visibility.h b/libmemcached/visibility.h
index 9405a88d6f8a5267b6d1658af8d7cdff6474484a..6ee385333e057b4ca93ace089c8c72f75b2529b3 100644 (file)
--- a/libmemcached/visibility.h
+++ b/libmemcached/visibility.h
@@ -1,11 +1,14 @@
-/*
- * Summary: interface for memcached server
- * Description: visibitliy macros 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 this directory for full text.
- * 
- * Author: Monty Taylor
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Interface for memcached server.
+ *
+ * Author: Trond Norbye
+ *
  */
 
 /**

diff --git a/tests/atomsmasher.c b/tests/atomsmasher.c
index 7650f592e39eba25453547fe074d1304ff1ef853..90f7e8f72a6674018bcc6eb9616e1ec320340a28 100644 (file)
--- a/tests/atomsmasher.c
+++ b/tests/atomsmasher.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /*
   Sample test application.
 */

diff --git a/tests/ketama_test_cases.h b/tests/ketama_test_cases.h
index 3d770f169773f4f977ff27c9484c6f63da946e8c..b01d1ab23cf43d5fcc935fea1a029063d16c9b36 100644 (file)
--- a/tests/ketama_test_cases.h
+++ b/tests/ketama_test_cases.h
@@ -1,3 +1,11 @@
+/*
+ * 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.
+ */
+
 #ifndef TESTS_KETAMA_TEST_CASES_H
 #define TESTS_KETAMA_TEST_CASES_H
 

diff --git a/tests/ketama_test_cases_spy.h b/tests/ketama_test_cases_spy.h
index 5e6a9378b918cb2f7ef524d91abf1df8424f2589..b9c0a96eeba7dfaf0a7b459c850a210c94f00ca8 100644 (file)
--- a/tests/ketama_test_cases_spy.h
+++ b/tests/ketama_test_cases_spy.h
@@ -1,3 +1,11 @@
+/*
+ * 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.
+ */
+
 #ifndef TESTS_KETAMA_TEST_CASES_SPY_H
 #define TESTS_KETAMA_TEST_CASES_SPY_H
 

diff --git a/tests/server.c b/tests/server.c
index f0926695133571f946ccfcad05a1f06dc11a5326..cdd22dea85017037a14dff0c6b644f41f428a1b3 100644 (file)
--- a/tests/server.c
+++ b/tests/server.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /*
   Startup, and shutdown the memcached servers.
 */

diff --git a/tests/server.h b/tests/server.h
index 26452f54db31e4a9933b4b2221f2cc9964a6d87d..0aef86f93ce28ee57747a18329499e32da1b726c 100644 (file)
--- a/tests/server.h
+++ b/tests/server.h
@@ -1,3 +1,11 @@
+/*
+ * 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.
+ */
+
 /*
   Server startup and shutdown functions.
 */

diff --git a/tests/start.c b/tests/start.c
index aa042f976fa957626f044d357a2509151f7748f3..eb37357d6b5b43e1b1d7a8f4bff8fafaa848c76f 100644 (file)
--- a/tests/start.c
+++ b/tests/start.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include "server.h"

diff --git a/tests/udp.c b/tests/udp.c
index a78c58221340eadf96d82e4d2f2d85b544e633f9..cdcd4ba4c7cfff20c9bbd9a5bcd72168d2630b61 100644 (file)
--- a/tests/udp.c
+++ b/tests/udp.c
@@ -1,3 +1,14 @@
+/* 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.
+ *
+ * Summary:
+ *
+ */
+
 /*
   Sample test application.
 */