projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
f875d40
)
C++: double underscores are reserved
author
Michael Wallner
<mike@php.net>
Fri, 11 Dec 2020 09:28:50 +0000
(10:28 +0100)
committer
Michael Wallner
<mike@php.net>
Fri, 11 Dec 2020 09:28:50 +0000
(10:28 +0100)
14 files changed:
CMake/_Include.cmake
patch
|
blob
|
history
libmemcached.cppcheck
patch
|
blob
|
history
src/libmemcached/connect.cc
patch
|
blob
|
history
src/libmemcached/get.cc
patch
|
blob
|
history
src/libmemcached/hosts.cc
patch
|
blob
|
history
src/libmemcached/instance.cc
patch
|
blob
|
history
src/libmemcached/instance.hpp
patch
|
blob
|
history
src/libmemcached/io.cc
patch
|
blob
|
history
src/libmemcached/memcached.cc
patch
|
blob
|
history
src/libmemcached/purge.cc
patch
|
blob
|
history
src/libmemcached/server.cc
patch
|
blob
|
history
src/libmemcached/server.hpp
patch
|
blob
|
history
src/libmemcached/server_list.cc
patch
|
blob
|
history
src/p9y/getopt.c
patch
|
blob
|
history
diff --git
a/CMake/_Include.cmake
b/CMake/_Include.cmake
index 29cdbf2566680e6551ade8d2cdf189ae2cc53405..c75c741f9a8eaa4a304fa2a81fd94d42780b551a 100644
(file)
--- a/
CMake/_Include.cmake
+++ b/
CMake/_Include.cmake
@@
-137,6
+137,7
@@
check_type(ssize_t sys/types.h)
check_type("struct msghdr" sys/socket.h)
check_cxx_symbol(abi::__cxa_demangle cxxabi.h)
check_type("struct msghdr" sys/socket.h)
check_cxx_symbol(abi::__cxa_demangle cxxabi.h)
+check_symbol(ERESTART errno.h)
check_symbol(fcntl fcntl.h)
check_symbol(gettimeofday sys/time.h)
check_symbol(htonll arpa/inet.h)
check_symbol(fcntl fcntl.h)
check_symbol(gettimeofday sys/time.h)
check_symbol(htonll arpa/inet.h)
diff --git
a/libmemcached.cppcheck
b/libmemcached.cppcheck
index 2baa38df4b287aac4b1c133e601f222133250ab2..4de7786796d8e6f8c1ac1dc48c06b43499f401c9 100644
(file)
--- a/
libmemcached.cppcheck
+++ b/
libmemcached.cppcheck
@@
-7,23
+7,14
@@
<check-unused-templates>false</check-unused-templates>
<max-ctu-depth>10</max-ctu-depth>
<includedir>
<check-unused-templates>false</check-unused-templates>
<max-ctu-depth>10</max-ctu-depth>
<includedir>
- <dir name="."/>
+ <dir name="include"/>
+ <dir name="src"/>
</includedir>
<undefines>
<undefine>HARD_MALLOC_TEST</undefine>
</undefines>
<paths>
</includedir>
<undefines>
<undefine>HARD_MALLOC_TEST</undefine>
</undefines>
<paths>
- <dir name="."/>
+ <dir name="include"/>
+ <dir name="src"/>
</paths>
</paths>
- <exclude>
- <path name=".git"/>
- <path name=".idea"/>
- <path name=".settings"/>
- <path name="docs"/>
- <path name="libmemcached/csl/parser.cc"/>
- <path name="libmemcached/csl/scanner.cc"/>
- <path name="libmemcached/memcached"/>
- <path name="libtest"/>
- <path name="tests"/>
- </exclude>
</project>
</project>
diff --git
a/src/libmemcached/connect.cc
b/src/libmemcached/connect.cc
index a4b9b40aee613c418f3fbdf2bbf714d357cbf470..84617133741a9e5332e212ac50f29af4f2a8b563 100644
(file)
--- a/
src/libmemcached/connect.cc
+++ b/
src/libmemcached/connect.cc
@@
-40,7
+40,7
@@
static memcached_return_t connect_poll(memcached_instance_st *server, const int
if ((number_of = poll(fds, 1, server->root->connect_timeout)) == SOCKET_ERROR) {
int local_errno = get_socket_errno(); // We cache in case closesocket() modifies errno
switch (local_errno) {
if ((number_of = poll(fds, 1, server->root->connect_timeout)) == SOCKET_ERROR) {
int local_errno = get_socket_errno(); // We cache in case closesocket() modifies errno
switch (local_errno) {
-#ifdef
__linux__
+#ifdef
HAVE_ERESTART
case ERESTART:
#endif
case EINTR:
case ERESTART:
#endif
case EINTR:
diff --git
a/src/libmemcached/get.cc
b/src/libmemcached/get.cc
index d625adce3824feb3e733ec2d794faad06b1d3e8e..1afef22d6e1b495317028f1f70768e9f930fc96f 100644
(file)
--- a/
src/libmemcached/get.cc
+++ b/
src/libmemcached/get.cc
@@
-21,7
+21,7
@@
char *memcached_get(memcached_st *ptr, const char *key, size_t key_length, size_
return memcached_get_by_key(ptr, NULL, 0, key, key_length, value_length, flags, error);
}
return memcached_get_by_key(ptr, NULL, 0, key, key_length, value_length, flags, error);
}
-static memcached_return_t
__
mget_by_key_real(memcached_st *ptr, const char *group_key,
+static memcached_return_t mget_by_key_real(memcached_st *ptr, const char *group_key,
size_t group_key_length, const char *const *keys,
const size_t *key_length, size_t number_of_keys,
const bool mget_mode);
size_t group_key_length, const char *const *keys,
const size_t *key_length, size_t number_of_keys,
const bool mget_mode);
@@
-40,8
+40,8
@@
char *memcached_get_by_key(memcached_st *shell, const char *group_key, size_t gr
}
/* Request the key */
}
/* Request the key */
- *error =
__
mget_by_key_real(ptr, group_key, group_key_length, (const char *const *) &key,
-
&key_length, 1, false);
+ *error = mget_by_key_real(ptr, group_key, group_key_length, (const char *const *) &key,
+ &key_length, 1, false);
if (ptr) {
assert_msg(ptr->query_id == query_id + 1,
"Programmer error, the query_id was not incremented.");
if (ptr) {
assert_msg(ptr->query_id == query_id + 1,
"Programmer error, the query_id was not incremented.");
@@
-133,8
+133,8
@@
static memcached_return_t binary_mget_by_key(memcached_st *ptr, const uint32_t m
const size_t *key_length, const size_t number_of_keys,
const bool mget_mode);
const size_t *key_length, const size_t number_of_keys,
const bool mget_mode);
-static memcached_return_t
__
mget_by_key_real(memcached_st *ptr, const char *group_key,
-
const
size_t group_key_length, const char *const *keys,
+static memcached_return_t mget_by_key_real(memcached_st *ptr, const char *group_key,
+ size_t group_key_length, const char *const *keys,
const size_t *key_length, size_t number_of_keys,
const bool mget_mode) {
bool failures_occured_in_sending = false;
const size_t *key_length, size_t number_of_keys,
const bool mget_mode) {
bool failures_occured_in_sending = false;
@@
-297,8
+297,7
@@
memcached_return_t memcached_mget_by_key(memcached_st *shell, const char *group_
size_t group_key_length, const char *const *keys,
const size_t *key_length, size_t number_of_keys) {
Memcached *ptr = memcached2Memcached(shell);
size_t group_key_length, const char *const *keys,
const size_t *key_length, size_t number_of_keys) {
Memcached *ptr = memcached2Memcached(shell);
- return __mget_by_key_real(ptr, group_key, group_key_length, keys, key_length, number_of_keys,
- true);
+ return mget_by_key_real(ptr, group_key, group_key_length, keys, key_length, number_of_keys, true);
}
memcached_return_t memcached_mget_execute(memcached_st *ptr, const char *const *keys,
}
memcached_return_t memcached_mget_execute(memcached_st *ptr, const char *const *keys,
diff --git
a/src/libmemcached/hosts.cc
b/src/libmemcached/hosts.cc
index 8f1215020214ea9f372952406f19157bce3d2ebf..ad01decd70faa1c4e494714db853cfb8011aac0d 100644
(file)
--- a/
src/libmemcached/hosts.cc
+++ b/
src/libmemcached/hosts.cc
@@
-311,7
+311,7
@@
static memcached_return_t server_add(Memcached *memc, const memcached_string_t &
memcached_instance_st *instance =
memcached_instance_fetch(memc, memcached_server_count(memc) - 1);
memcached_instance_st *instance =
memcached_instance_fetch(memc, memcached_server_count(memc) - 1);
- if (
__
instance_create_with(memc, instance, hostname, port, weight, type) == NULL) {
+ if (instance_create_with(memc, instance, hostname, port, weight, type) == NULL) {
return memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
}
return memcached_set_error(*memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
}
@@
-353,8
+353,7
@@
memcached_return_t memcached_server_push(memcached_st *shell, const memcached_se
WATCHPOINT_ASSERT(instance);
memcached_string_t hostname = {memcached_string_make_from_cstr(list[x].hostname)};
WATCHPOINT_ASSERT(instance);
memcached_string_t hostname = {memcached_string_make_from_cstr(list[x].hostname)};
- if (__instance_create_with(ptr, instance, hostname, list[x].port, list[x].weight,
- list[x].type)
+ if (instance_create_with(ptr, instance, hostname, list[x].port, list[x].weight, list[x].type)
== NULL)
{
ptr->state.is_parsing = false;
== NULL)
{
ptr->state.is_parsing = false;
@@
-404,8
+403,7
@@
memcached_return_t memcached_instance_push(memcached_st *ptr,
WATCHPOINT_ASSERT(instance);
memcached_string_t hostname = {memcached_string_make_from_cstr(list[x]._hostname)};
WATCHPOINT_ASSERT(instance);
memcached_string_t hostname = {memcached_string_make_from_cstr(list[x]._hostname)};
- if (__instance_create_with(ptr, instance, hostname, list[x].port(), list[x].weight,
- list[x].type)
+ if (instance_create_with(ptr, instance, hostname, list[x].port(), list[x].weight, list[x].type)
== NULL)
{
ptr->state.is_parsing = false;
== NULL)
{
ptr->state.is_parsing = false;
diff --git
a/src/libmemcached/instance.cc
b/src/libmemcached/instance.cc
index 266eccc70f8d8b6f53b73b1513ab7879ff5447e6..a6725d18169af5b7b5e991524f1c6327a05dcb34 100644
(file)
--- a/
src/libmemcached/instance.cc
+++ b/
src/libmemcached/instance.cc
@@
-97,11
+97,11
@@
void memcached_instance_st::revents(short arg) {
_events &= short(~arg);
}
_events &= short(~arg);
}
-memcached_instance_st *
__
instance_create_with(memcached_st *memc, memcached_instance_st *self,
- const memcached_string_t &hostname,
+memcached_instance_st *instance_create_with(memcached_st *memc, memcached_instance_st *self,
+ const memcached_string_t &
_
hostname,
const in_port_t port, uint32_t weight,
const memcached_connection_t type) {
const in_port_t port, uint32_t weight,
const memcached_connection_t type) {
- if (memcached_is_valid_servername(hostname) == false) {
+ if (memcached_is_valid_servername(
_
hostname) == false) {
memcached_set_error(*memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
memcached_literal_param("Invalid hostname provided"));
return NULL;
memcached_set_error(*memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
memcached_literal_param("Invalid hostname provided"));
return NULL;
@@
-113,7
+113,7
@@
memcached_instance_st *__instance_create_with(memcached_st *memc, memcached_inst
return NULL;
}
return NULL;
}
- _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
+ _server_init(self, const_cast<memcached_st *>(memc),
_
hostname, port, weight, type);
if (memc and memcached_is_udp(memc)) {
self->write_buffer_offset = UDP_DATAGRAM_HEADER_LENGTH;
if (memc and memcached_is_udp(memc)) {
self->write_buffer_offset = UDP_DATAGRAM_HEADER_LENGTH;
@@
-123,7
+123,7
@@
memcached_instance_st *__instance_create_with(memcached_st *memc, memcached_inst
return self;
}
return self;
}
-void
__
instance_free(memcached_instance_st *self) {
+void instance_free(memcached_instance_st *self) {
memcached_quit_server(self, false);
self->clear_addrinfo();
memcached_quit_server(self, false);
self->clear_addrinfo();
@@
-140,7
+140,7
@@
void __instance_free(memcached_instance_st *self) {
void memcached_instance_free(memcached_instance_st *self) {
if (self) {
void memcached_instance_free(memcached_instance_st *self) {
if (self) {
-
__
instance_free(self);
+ instance_free(self);
}
}
}
}
@@
-226,8
+226,8
@@
static memcached_instance_st *memcached_instance_clone(memcached_instance_st *so
}
memcached_string_t hostname_ = {memcached_string_make_from_cstr(source->hostname())};
}
memcached_string_t hostname_ = {memcached_string_make_from_cstr(source->hostname())};
- return
__
instance_create_with(source->root, NULL, hostname_, source->port(), source->weight,
-
source->type);
+ return instance_create_with(source->root, NULL, hostname_, source->port(), source->weight,
+ source->type);
}
void set_last_disconnected_host(memcached_instance_st *self) {
}
void set_last_disconnected_host(memcached_instance_st *self) {
diff --git
a/src/libmemcached/instance.hpp
b/src/libmemcached/instance.hpp
index 57f68786b10d8ccc1f1a22b26d3978e398091c0f..de07253666c8ca2ddeb87600d026c82a3fa62013 100644
(file)
--- a/
src/libmemcached/instance.hpp
+++ b/
src/libmemcached/instance.hpp
@@
-135,7
+135,7
@@
struct memcached_instance_st {
}
};
}
};
-memcached_instance_st *
__
instance_create_with(memcached_st *memc, memcached_instance_st *self,
+memcached_instance_st *instance_create_with(memcached_st *memc, memcached_instance_st *self,
const memcached_string_t &_hostname,
const in_port_t port, uint32_t weight,
const memcached_connection_t type);
const memcached_string_t &_hostname,
const in_port_t port, uint32_t weight,
const memcached_connection_t type);
@@
-143,4
+143,4
@@
memcached_instance_st *__instance_create_with(memcached_st *memc, memcached_inst
memcached_return_t memcached_instance_push(memcached_st *ptr, const memcached_instance_st *,
uint32_t);
memcached_return_t memcached_instance_push(memcached_st *ptr, const memcached_instance_st *,
uint32_t);
-void
__
instance_free(memcached_instance_st *);
+void instance_free(memcached_instance_st *);
diff --git
a/src/libmemcached/io.cc
b/src/libmemcached/io.cc
index 0cf1931a3add659a99d3180b79a9e261b668677d..1cc62e47d942d077f329d400761d5938f37db5c6 100644
(file)
--- a/
src/libmemcached/io.cc
+++ b/
src/libmemcached/io.cc
@@
-60,7
+60,7
@@
static bool repack_input_buffer(memcached_instance_st *instance) {
case EWOULDBLOCK:
#endif
case EAGAIN:
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef
__linux
+#ifdef
HAVE_ERESTART
case ERESTART:
#endif
break; // No IO is fine, we can just move on
case ERESTART:
#endif
break; // No IO is fine, we can just move on
@@
-209,7
+209,7
@@
static memcached_return_t io_wait(memcached_instance_st *instance, const short e
int local_errno = get_socket_errno(); // We cache in case memcached_quit_server() modifies errno
assert_msg(active_fd == -1, "poll() returned an unexpected value");
switch (local_errno) {
int local_errno = get_socket_errno(); // We cache in case memcached_quit_server() modifies errno
assert_msg(active_fd == -1, "poll() returned an unexpected value");
switch (local_errno) {
-#ifdef
__linux
+#ifdef
ERESTART
case ERESTART:
#endif
case EINTR:
case ERESTART:
#endif
case EINTR:
@@
-367,7
+367,7
@@
static memcached_return_t _io_fill(memcached_instance_st *instance) {
case EWOULDBLOCK:
#endif
case EAGAIN:
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef
__linux
+#ifdef
HAVE_ERESTART
case ERESTART:
#endif
{
case ERESTART:
#endif
{
@@
-496,7
+496,7
@@
memcached_return_t memcached_io_slurp(memcached_instance_st *instance) {
case EWOULDBLOCK:
#endif
case EAGAIN:
case EWOULDBLOCK:
#endif
case EAGAIN:
-#ifdef
__linux
+#ifdef
ERESTART
case ERESTART:
#endif
if (memcached_success(io_wait(instance, POLLIN))) {
case ERESTART:
#endif
if (memcached_success(io_wait(instance, POLLIN))) {
diff --git
a/src/libmemcached/memcached.cc
b/src/libmemcached/memcached.cc
index 7c80e5efc7f13319f26f72f17cec76f6f0048a3d..586744f0221c3bf20d75ea4d424201178e9522ba 100644
(file)
--- a/
src/libmemcached/memcached.cc
+++ b/
src/libmemcached/memcached.cc
@@
-104,7
+104,7
@@
static inline bool _memcached_init(Memcached *self) {
return true;
}
return true;
}
-static void
__memcached_free
(Memcached *ptr, bool release_st) {
+static void
memcached_free_ex
(Memcached *ptr, bool release_st) {
/* If we have anything open, lets close it now */
send_quit(ptr);
memcached_instance_list_free(memcached_instance_list(ptr), memcached_instance_list_count(ptr));
/* If we have anything open, lets close it now */
send_quit(ptr);
memcached_instance_list_free(memcached_instance_list(ptr), memcached_instance_list_count(ptr));
@@
-219,7
+219,7
@@
memcached_return_t memcached_reset(memcached_st *shell) {
bool stored_is_allocated = memcached_is_allocated(ptr);
uint64_t query_id = ptr->query_id;
bool stored_is_allocated = memcached_is_allocated(ptr);
uint64_t query_id = ptr->query_id;
-
__memcached_free
(ptr, false);
+
memcached_free_ex
(ptr, false);
memcached_create(ptr);
memcached_set_allocated(ptr, stored_is_allocated);
ptr->query_id = query_id;
memcached_create(ptr);
memcached_set_allocated(ptr, stored_is_allocated);
ptr->query_id = query_id;
@@
-256,7
+256,7
@@
void memcached_reset_last_disconnected_server(memcached_st *shell) {
void memcached_free(memcached_st *ptr) {
if (ptr) {
void memcached_free(memcached_st *ptr) {
if (ptr) {
-
__memcached_free
(ptr, true);
+
memcached_free_ex
(ptr, true);
}
}
}
}
diff --git
a/src/libmemcached/purge.cc
b/src/libmemcached/purge.cc
index 4437d76100b53354b9c660107c5014d2975eae9d..d69437014879fc708a544fa90cbf5ec99c6f5815 100644
(file)
--- a/
src/libmemcached/purge.cc
+++ b/
src/libmemcached/purge.cc
@@
-15,7
+15,7
@@
#include "libmemcached/common.h"
#include "libmemcached/common.h"
-#define memcached_set_purging(
__object, __value) ((__object)->state.is_purging = (__value
))
+#define memcached_set_purging(
object_, value_) ((object_)->state.is_purging = (value_
))
class Purge {
public:
class Purge {
public:
diff --git
a/src/libmemcached/server.cc
b/src/libmemcached/server.cc
index e038196abffd52fe8d3052e7365ec10c2d0c9f79..6633da9ce0bf57b99dc91fb02eb4a9ead84f14f3 100644
(file)
--- a/
src/libmemcached/server.cc
+++ b/
src/libmemcached/server.cc
@@
-72,7
+72,7
@@
static memcached_server_st *_server_create(memcached_server_st *self, const Memc
return self;
}
return self;
}
-memcached_server_st *
__server_create_with(Memcached *memc, memcached_server_st *allocated_instance
,
+memcached_server_st *
server_create_with(Memcached *memc, memcached_server_st *self
,
const memcached_string_t &hostname, const in_port_t port,
uint32_t weight, const memcached_connection_t type) {
if (memcached_is_valid_servername(hostname) == false) {
const memcached_string_t &hostname, const in_port_t port,
uint32_t weight, const memcached_connection_t type) {
if (memcached_is_valid_servername(hostname) == false) {
@@
-81,18
+81,18
@@
memcached_server_st *__server_create_with(Memcached *memc, memcached_server_st *
return NULL;
}
return NULL;
}
-
allocated_instance = _server_create(allocated_instance
, memc);
+
self = _server_create(self
, memc);
- if (
allocated_instance
== NULL) {
+ if (
self
== NULL) {
return NULL;
}
return NULL;
}
- _server_init(
allocated_instance
, const_cast<Memcached *>(memc), hostname, port, weight, type);
+ _server_init(
self
, const_cast<Memcached *>(memc), hostname, port, weight, type);
- return
allocated_instance
;
+ return
self
;
}
}
-void
__
server_free(memcached_server_st *self) {
+void server_free(memcached_server_st *self) {
memcached_error_free(*self);
if (memcached_is_allocated(self)) {
memcached_error_free(*self);
if (memcached_is_allocated(self)) {
@@
-112,7
+112,7
@@
void memcached_server_free(memcached_server_st *self) {
return;
}
return;
}
-
__
server_free(self);
+ server_free(self);
}
void memcached_server_error_reset(memcached_server_st *self) {
}
void memcached_server_error_reset(memcached_server_st *self) {
diff --git
a/src/libmemcached/server.hpp
b/src/libmemcached/server.hpp
index 86f6ffb9000950a3ad6d37941d2e26670851285b..d6fdd0da6a5c7e0694246ead1d5cd69780cf40d8 100644
(file)
--- a/
src/libmemcached/server.hpp
+++ b/
src/libmemcached/server.hpp
@@
-19,7
+19,7
@@
#include <cassert>
#include <cassert>
-memcached_server_st *
__
server_create_with(memcached_st *memc, memcached_server_st *self,
+memcached_server_st *server_create_with(memcached_st *memc, memcached_server_st *self,
const memcached_string_t &hostname, const in_port_t port,
uint32_t weight, const memcached_connection_t type);
const memcached_string_t &hostname, const in_port_t port,
uint32_t weight, const memcached_connection_t type);
@@
-27,7
+27,7
@@
memcached_return_t memcached_server_add_parsed(memcached_st *ptr, const char *ho
size_t hostname_length, in_port_t port,
uint32_t weight);
size_t hostname_length, in_port_t port,
uint32_t weight);
-void
__
server_free(memcached_server_st *);
+void server_free(memcached_server_st *);
static inline bool memcached_is_valid_servername(const memcached_string_t &arg) {
return (arg.c_str != NULL or arg.size == 0) and arg.size < MEMCACHED_NI_MAXHOST;
static inline bool memcached_is_valid_servername(const memcached_string_t &arg) {
return (arg.c_str != NULL or arg.size == 0) and arg.size < MEMCACHED_NI_MAXHOST;
diff --git
a/src/libmemcached/server_list.cc
b/src/libmemcached/server_list.cc
index 665b75dc0dc5754a16aed23e401cd7f46cb4b693..5fe0acd6c9190deda4add02ae5e06b972bfdf293 100644
(file)
--- a/
src/libmemcached/server_list.cc
+++ b/
src/libmemcached/server_list.cc
@@
-51,8
+51,8
@@
memcached_server_list_st memcached_server_list_append_with_weight(memcached_serv
memcached_string_t _hostname = {memcached_string_make_from_cstr(hostname)};
/* @todo Check return type */
memcached_string_t _hostname = {memcached_string_make_from_cstr(hostname)};
/* @todo Check return type */
- if (
__
server_create_with(NULL, &new_host_list[count - 1], _hostname, port, weight,
-
port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET)
+ if (server_create_with(NULL, &new_host_list[count - 1], _hostname, port, weight,
+ port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET)
== NULL)
{
#if 0
== NULL)
{
#if 0
@@
-63,7
+63,7
@@
memcached_server_list_st memcached_server_list_append_with_weight(memcached_serv
}
#if 0
}
#if 0
- // Handset allocated since
+ // Handset allocated since
new_host_list->options.is_allocated= true;
#endif
new_host_list->options.is_allocated= true;
#endif
@@
-101,7
+101,7
@@
void memcached_server_list_free(memcached_server_list_st self) {
assert_msg(not memcached_is_allocated(&self[x]),
"You have called memcached_server_list_free(), but you did not pass it a valid "
"memcached_server_list_st");
assert_msg(not memcached_is_allocated(&self[x]),
"You have called memcached_server_list_free(), but you did not pass it a valid "
"memcached_server_list_st");
-
__
server_free(&self[x]);
+ server_free(&self[x]);
}
libmemcached_free(self->root, self);
}
libmemcached_free(self->root, self);
@@
-114,7
+114,7
@@
void memcached_instance_list_free(memcached_instance_st *self, uint32_t instance
assert_msg(memcached_is_allocated(&self[x]) == false,
"You have called memcached_server_list_free(), but you did not pass it a valid "
"memcached_server_list_st");
assert_msg(memcached_is_allocated(&self[x]) == false,
"You have called memcached_server_list_free(), but you did not pass it a valid "
"memcached_server_list_st");
-
__
instance_free(&self[x]);
+ instance_free(&self[x]);
}
libmemcached_free(self->root, self);
}
libmemcached_free(self->root, self);
diff --git
a/src/p9y/getopt.c
b/src/p9y/getopt.c
index 40434941454d0999fde0a9335cd879424dbc5c76..6d0fe62a87f449dfc6202102414ced4d3ead20b4 100644
(file)
--- a/
src/p9y/getopt.c
+++ b/
src/p9y/getopt.c
@@
-110,7
+110,7
@@
char *optarg; /* argument associated with option */
#define INORDER (int)1
#ifndef __CYGWIN__
#define INORDER (int)1
#ifndef __CYGWIN__
-#define
__
progname __argv[0]
+#define progname __argv[0]
#else
extern char __declspec(dllimport) *__progname;
#endif
#else
extern char __declspec(dllimport) *__progname;
#endif
@@
-145,7
+145,7
@@
static const char illoptstring[] = "unknown option -- %s";
static void
_vwarnx(const char *fmt,va_list ap)
{
static void
_vwarnx(const char *fmt,va_list ap)
{
- (void)fprintf(stderr,"%s: ",
__
progname);
+ (void)fprintf(stderr,"%s: ",
progname);
if (fmt != NULL)
(void)vfprintf(stderr,fmt,ap);
(void)fprintf(stderr,"\n");
if (fmt != NULL)
(void)vfprintf(stderr,fmt,ap);
(void)fprintf(stderr,"\n");