projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix typo
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 7942b27a34011bf96d18887779754a6f78c47866..30fc4e12a9fbfb6203075b55b948dcd4af523b3d 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-48,6
+48,7
@@
#include "libmemcached/memcached_internal.h"
#include "libmemcached/libmemcached_probes.h"
#include "libmemcached/memcached/protocol_binary.h"
#include "libmemcached/memcached_internal.h"
#include "libmemcached/libmemcached_probes.h"
#include "libmemcached/memcached/protocol_binary.h"
+#include "libmemcached/byteorder.h"
/* string value */
struct memcached_continuum_item_st {
/* string value */
struct memcached_continuum_item_st {
@@
-135,28
+136,22
@@
LIBMEMCACHED_LOCAL
void server_list_free(memcached_st *ptr, memcached_server_st *servers);
LIBMEMCACHED_LOCAL
void server_list_free(memcached_st *ptr, memcached_server_st *servers);
LIBMEMCACHED_LOCAL
-memcached_return memcached_key_test(const char **keys, size_t *key_length,
- unsigned int number_of_keys);
+memcached_return memcached_key_test(const char * const *keys,
+ const size_t *key_length,
+ size_t number_of_keys);
LIBMEMCACHED_LOCAL
uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
LIBMEMCACHED_LOCAL
uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
-#ifndef HAVE_HTONLL
-LIBMEMCACHED_LOCAL
-extern uint64_t ntohll(uint64_t);
-LIBMEMCACHED_LOCAL
-extern uint64_t htonll(uint64_t);
-#endif
-
LIBMEMCACHED_LOCAL
memcached_return memcached_purge(memcached_server_st *ptr);
LIBMEMCACHED_LOCAL
memcached_return memcached_purge(memcached_server_st *ptr);
-static inline memcached_return memcached_validate_key_length(size_t key_length,
+static inline memcached_return memcached_validate_key_length(size_t key_length,
bool binary) {
unlikely (key_length == 0)
return MEMCACHED_BAD_KEY_PROVIDED;
bool binary) {
unlikely (key_length == 0)
return MEMCACHED_BAD_KEY_PROVIDED;
-
+
if (binary)
{
unlikely (key_length > 0xffff)
if (binary)
{
unlikely (key_length > 0xffff)
@@
-164,7
+159,7
@@
static inline memcached_return memcached_validate_key_length(size_t key_length,
}
else
{
}
else
{
- unlikely (key_length >= MEMCACHED_MAX_KEY)
+ unlikely (key_length >= MEMCACHED_MAX_KEY)
return MEMCACHED_BAD_KEY_PROVIDED;
}
return MEMCACHED_BAD_KEY_PROVIDED;
}