X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver_list.h;h=8fe6dc7dc2ffb8d99822c5a8baf3acee65204cd6;hb=5febc397f702ce74f79f3e590432c85b025a32fc;hp=a4b90b9fd54bb877565c15768c2339f1ea9213f1;hpb=77fe608489d91a0271efe8170ba97c44d51e346b;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server_list.h b/libmemcached/server_list.h
index a4b90b9f..8fe6dc7d 100644
--- a/libmemcached/server_list.h
+++ b/libmemcached/server_list.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) 2006-2009 Brian Aker All rights reserved.
  *
- * Summary: Types 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_SERVER_LIST_H__
-#define __LIBMEMCACHED_SERVER_LIST_H__
+#pragma once
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -18,36 +44,34 @@ extern "C" {
 
 /* Server List Public functions */
 LIBMEMCACHED_API
-void memcached_server_list_free(memcached_server_st *ptr);
+  void memcached_server_list_free(memcached_server_list_st ptr);
 
 LIBMEMCACHED_API
-memcached_return_t memcached_server_push(memcached_st *ptr, const memcached_server_st *list);
+  memcached_return_t memcached_server_push(memcached_st *ptr, const memcached_server_list_st list);
 
 LIBMEMCACHED_API
-memcached_server_st *memcached_server_list_append(memcached_server_st *ptr,
-                                                  const char *hostname,
-                                                  in_port_t port,
-                                                  memcached_return_t *error);
+  memcached_server_list_st memcached_server_list_append(memcached_server_list_st ptr,
+                                                        const char *hostname,
+                                                        in_port_t port,
+                                                        memcached_return_t *error);
 LIBMEMCACHED_API
-memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr,
-                                                              const char *hostname,
-                                                              in_port_t port,
-                                                              uint32_t weight,
-                                                              memcached_return_t *error);
+  memcached_server_list_st memcached_server_list_append_with_weight(memcached_server_list_st ptr,
+                                                                    const char *hostname,
+                                                                    in_port_t port,
+                                                                    uint32_t weight,
+                                                                    memcached_return_t *error);
 LIBMEMCACHED_API
-uint32_t memcached_server_list_count(const memcached_server_st *ptr);
+  uint32_t memcached_server_list_count(const memcached_server_list_st ptr);
 
 LIBMEMCACHED_LOCAL
-uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count);
+  uint32_t memcached_servers_set_count(memcached_server_list_st servers, uint32_t count);
 
-LIBMEMCACHED_API
-memcached_server_st *memcached_server_list(memcached_st *);
+LIBMEMCACHED_LOCAL
+  memcached_server_st *memcached_server_list(const memcached_st *);
 
 LIBMEMCACHED_LOCAL
-void memcached_server_list_set(memcached_st *self, memcached_server_st *list);
+  void memcached_server_list_set(memcached_st *self, memcached_server_list_st list);
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
-
-#endif /* __LIBMEMCACHED_SERVER_LIST_H__ */