projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in additional type fixes.
[m6w6/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 1e1db2f5e0dd2028c8f9a589a34bf19080a3bc3d..67d7cb059ce8ff5fec3764ab3f4913f68544d790 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-13,8
+13,8
@@
Common include file for libmemached
*/
Common include file for libmemached
*/
-#ifndef
LIBMEMCACHED_COMMON_H
-#define
LIBMEMCACHED_COMMON_H
+#ifndef
__LIBMEMCACHED_COMMON_H__
+#define
__LIBMEMCACHED_COMMON_H__
#include "config.h"
#include "config.h"
@@
-54,9
+54,13
@@
#include "libmemcached/memcached.h"
#include "libmemcached/watchpoint.h"
#include "libmemcached/memcached.h"
#include "libmemcached/watchpoint.h"
-typedef struct memcached_server_st memcached_server_instance_st;
+typedef struct memcached_server_st * memcached_server_write_instance_st;
+
+LIBMEMCACHED_LOCAL
+memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key);
/* These are private not to be installed headers */
/* These are private not to be installed headers */
+#include "libmemcached/do.h"
#include "libmemcached/io.h"
#include "libmemcached/internal.h"
#include "libmemcached/libmemcached_probes.h"
#include "libmemcached/io.h"
#include "libmemcached/internal.h"
#include "libmemcached/libmemcached_probes.h"
@@
-95,10
+99,12
@@
typedef enum {
#define SMALL_STRING_LEN 1024
#define HUGE_STRING_LEN 8196
#define SMALL_STRING_LEN 1024
#define HUGE_STRING_LEN 8196
+#ifdef __cplusplus
+extern "C" {
+#endif
+
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-memcached_return_t memcached_connect(memcached_server_instance_st *ptr);
-LIBMEMCACHED_LOCAL
-void memcached_quit_server(memcached_server_instance_st *ptr, uint8_t io_death);
+memcached_return_t memcached_connect(memcached_server_write_instance_st ptr);
LIBMEMCACHED_LOCAL
memcached_return_t run_distribution(memcached_st *ptr);
LIBMEMCACHED_LOCAL
memcached_return_t run_distribution(memcached_st *ptr);
@@
-118,27
+124,26
@@
memcached_return_t run_distribution(memcached_st *ptr);
#define memcached_set_allocated(__object, __value) ((__object)->options.is_allocated(= (__value))
#define memcached_set_allocated(__object, __value) ((__object)->options.is_allocated(= (__value))
-LIBMEMCACHED_LOCAL
-memcached_return_t memcached_do(memcached_server_instance_st *ptr, const void *commmand,
- size_t command_length, uint8_t with_flush);
LIBMEMCACHED_LOCAL
memcached_return_t value_fetch(memcached_server_instance_st *ptr,
char *buffer,
memcached_result_st *result);
LIBMEMCACHED_LOCAL
memcached_return_t value_fetch(memcached_server_instance_st *ptr,
char *buffer,
memcached_result_st *result);
-LIBMEMCACHED_LOCAL
-void server_list_free(memcached_st *ptr, memcached_server_instance_st *servers);
-
LIBMEMCACHED_LOCAL
memcached_return_t memcached_key_test(const char * const *keys,
const size_t *key_length,
size_t number_of_keys);
LIBMEMCACHED_LOCAL
memcached_return_t memcached_key_test(const char * const *keys,
const size_t *key_length,
size_t number_of_keys);
-
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-
uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length
);
+
memcached_return_t memcached_purge(memcached_server_write_instance_st ptr
);
LIBMEMCACHED_LOCAL
LIBMEMCACHED_LOCAL
-memcached_return_t memcached_purge(memcached_server_instance_st *ptr);
+memcached_server_st *memcached_server_create_with(const memcached_st *memc,
+ memcached_server_write_instance_st host,
+ const char *hostname,
+ in_port_t port,
+ uint32_t weight,
+ memcached_connection_t type);
+
static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool binary)
{
static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool binary)
{
@@
-217,5
+222,8
@@
static inline void *libmemcached_calloc(const memcached_st *ptr, size_t nelem, s
return ptr->allocators.calloc(ptr, nelem, size, ptr->allocators.context);
}
return ptr->allocators.calloc(ptr, nelem, size, ptr->allocators.context);
}
+#ifdef __cplusplus
+}
+#endif
-#endif /*
LIBMEMCACHED_COMMON_H
*/
+#endif /*
__LIBMEMCACHED_COMMON_H__
*/