Merge up trunk

[m6w6/libmemcached] / libmemcached / protocol / common.h

diff --git a/libmemcached/protocol/common.h b/libmemcached/protocol/common.h
index 20fa16e554f7f7b157445ae7475e9c744b720da5..808a608609f1b18c9f0a43178dcd289561f878fc 100644 (file)
--- a/libmemcached/protocol/common.h
+++ b/libmemcached/protocol/common.h
@@ -1,18 +1,48 @@
-/* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-#ifndef LIBMEMCACHED_PROTOCOL_COMMON_H
-#define LIBMEMCACHED_PROTOCOL_COMMON_H
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  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.
+ *
+ */
+
+#pragma once
 
 #include "config.h"
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 #include <assert.h>
-#include <netinet/in.h>
 
-/* Define this here, which will turn on the visibilty controls while we're
- * building libmemcached.
- */
-#define BUILDING_LIBMEMCACHED 1
-
-#include <libmemcached/byteorder.h>
+#include <libmemcached/visibility.h>
 #include <libmemcached/protocol_handler.h>
 #include <libmemcached/protocol/cache.h>
 
@@ -23,8 +53,8 @@
  * but some people still do). If it ever shows up as a performance thing
  * I'll look into optimizing this ;-)
  */
-typedef bool (*drain_func)(struct memcached_protocol_client_st *client);
-typedef protocol_binary_response_status (*spool_func)(struct memcached_protocol_client_st *client,
+typedef bool (*drain_func)(memcached_protocol_client_st *client);
+typedef protocol_binary_response_status (*spool_func)(memcached_protocol_client_st *client,
                                                       const void *data,
                                                       size_t length);
 
@@ -32,7 +62,7 @@ typedef protocol_binary_response_status (*spool_func)(struct memcached_protocol_
  * Definition of the per instance structure.
  */
 struct memcached_protocol_st {
-  struct memcached_binary_protocol_callback_st *callback;
+  memcached_binary_protocol_callback_st *callback;
   memcached_protocol_recv_func recv;
   memcached_protocol_send_func send;
 
@@ -73,7 +103,7 @@ struct chunk_st {
 
 #define CHUNK_BUFFERSIZE 2048
 
-typedef enum MEMCACHED_PROTOCOL_EVENT (*process_data)(struct memcached_protocol_client_st *client, ssize_t *length, void **endptr);
+typedef memcached_protocol_event_t (*process_data)(struct memcached_protocol_client_st *client, ssize_t *length, void **endptr);
 
 enum ascii_cmd {
   GET_CMD,
@@ -92,12 +122,12 @@ enum ascii_cmd {
   VERSION_CMD,
   QUIT_CMD,
   VERBOSITY_CMD,
-  UNKNOWN_CMD,
+  UNKNOWN_CMD
 };
 
 struct memcached_protocol_client_st {
-  struct memcached_protocol_st *root;
-  int sock;
+  memcached_protocol_st *root;
+  memcached_socket_t sock;
   int error;
 
   /* Linked list of data to send */
@@ -131,5 +161,3 @@ struct memcached_protocol_client_st {
 
 #include "ascii_handler.h"
 #include "binary_handler.h"
-
-#endif