projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-456
[m6w6/libmemcached]
/
clients
/
memcapable.cc
diff --git
a/clients/memcapable.cc
b/clients/memcapable.cc
index c8d294f95fb14d5235aad1e43ceeb894a60f1a8e..3e9bfabfbf2e9b63136353376b7e7b9359cef4d8 100644
(file)
--- a/
clients/memcapable.cc
+++ b/
clients/memcapable.cc
@@
-110,9
+110,13
@@
static struct addrinfo *lookuphost(const char *hostname, const char *port)
if (error != 0)
{
if (error != EAI_SYSTEM)
if (error != 0)
{
if (error != EAI_SYSTEM)
+ {
fprintf(stderr, "getaddrinfo(): %s\n", gai_strerror(error));
fprintf(stderr, "getaddrinfo(): %s\n", gai_strerror(error));
+ }
else
else
+ {
perror("getaddrinfo()");
perror("getaddrinfo()");
+ }
}
return ai;
}
return ai;
@@
-124,7
+128,7
@@
static struct addrinfo *lookuphost(const char *hostname, const char *port)
*/
static memcached_socket_t set_noblock(void)
{
*/
static memcached_socket_t set_noblock(void)
{
-#if
def WIN32
+#if
defined(_WIN32)
u_long arg = 1;
if (ioctlsocket(sock, FIONBIO, &arg) == SOCKET_ERROR)
{
u_long arg = 1;
if (ioctlsocket(sock, FIONBIO, &arg) == SOCKET_ERROR)
{
@@
-182,8
+186,9
@@
static memcached_socket_t connect_server(const char *hostname, const char *port)
}
}
else
}
}
else
- fprintf(stderr, "Failed to create socket: %s\n",
- strerror(get_socket_errno()));
+ {
+ fprintf(stderr, "Failed to create socket: %s\n", strerror(get_socket_errno()));
+ }
freeaddrinfo(ai);
}
freeaddrinfo(ai);
}
@@
-249,7
+254,7
@@
static enum test_return ensure(bool val, const char *expression, const char *fil
{
if (verbose)
{
{
if (verbose)
{
- fprintf(std
err
, "\n%s:%d: %s", file, line, expression);
+ fprintf(std
out
, "\n%s:%d: %s", file, line, expression);
}
if (do_core)
}
if (do_core)
@@
-334,7
+339,7
@@
static enum test_return retry_read(void *buf, size_t len)
ssize_t nr= timeout_io_op(sock, POLLIN, ((char*) buf) + offset, len - offset);
switch (nr) {
case -1 :
ssize_t nr= timeout_io_op(sock, POLLIN, ((char*) buf) + offset, len - offset);
switch (nr) {
case -1 :
-
fprintf(stderr, "Errno: %d %s\n", get_socket_errno(), strerror(errno));
+ fprintf(stderr, "Errno: %d %s\n", get_socket_errno(), strerror(errno));
verify(get_socket_errno() == EINTR || get_socket_errno() == EAGAIN);
break;
verify(get_socket_errno() == EINTR || get_socket_errno() == EAGAIN);
break;
@@
-1389,11
+1394,15
@@
static enum test_return ascii_get_unknown_value(char **key, char **value, ssize_
verify(*key != NULL);
char *ptr= end + 1;
verify(*key != NULL);
char *ptr= end + 1;
+ errno= 0;
unsigned long val= strtoul(ptr, &end, 10); /* flags */
unsigned long val= strtoul(ptr, &end, 10); /* flags */
+ verify(errno == 0);
verify(ptr != end);
verify(val == 0);
verify(end != NULL);
verify(ptr != end);
verify(val == 0);
verify(end != NULL);
+ errno= 0;
*ndata = (ssize_t)strtoul(end, &end, 10); /* size */
*ndata = (ssize_t)strtoul(end, &end, 10); /* size */
+ verify(errno == 0);
verify(ptr != end);
verify(end != NULL);
while (end and *end != '\n' and isspace(*end))
verify(ptr != end);
verify(end != NULL);
while (end and *end != '\n' and isspace(*end))
@@
-1424,11
+1433,16
@@
static enum test_return ascii_get_value(const char *key, const char *value)
char *ptr= buffer + 6 + strlen(key) + 1;
char *end;
char *ptr= buffer + 6 + strlen(key) + 1;
char *end;
+ errno= 0;
unsigned long val= strtoul(ptr, &end, 10); /* flags */
unsigned long val= strtoul(ptr, &end, 10); /* flags */
+ verify(errno == 0);
verify(ptr != end);
verify(val == 0);
verify(end != NULL);
verify(ptr != end);
verify(val == 0);
verify(end != NULL);
+
+ errno= 0;
val= strtoul(end, &end, 10); /* size */
val= strtoul(end, &end, 10); /* size */
+ verify(errno == 0);
verify(ptr != end);
verify(val == datasize);
verify(end != NULL);
verify(ptr != end);
verify(val == datasize);
verify(end != NULL);
@@
-1486,15
+1500,23
@@
static enum test_return ascii_gets_value(const char *key, const char *value,
char *ptr= buffer + 6 + strlen(key) + 1;
char *end;
char *ptr= buffer + 6 + strlen(key) + 1;
char *end;
+ errno= 0;
unsigned long val= strtoul(ptr, &end, 10); /* flags */
unsigned long val= strtoul(ptr, &end, 10); /* flags */
+ verify(errno == 0);
verify(ptr != end);
verify(val == 0);
verify(end != NULL);
verify(ptr != end);
verify(val == 0);
verify(end != NULL);
+
+ errno= 0;
val= strtoul(end, &end, 10); /* size */
val= strtoul(end, &end, 10); /* size */
+ verify(errno == 0);
verify(ptr != end);
verify(val == datasize);
verify(end != NULL);
verify(ptr != end);
verify(val == datasize);
verify(end != NULL);
+
+ errno= 0;
*cas= strtoul(end, &end, 10); /* cas */
*cas= strtoul(end, &end, 10); /* cas */
+ verify(errno == 0);
verify(ptr != end);
verify(val == datasize);
verify(end != NULL);
verify(ptr != end);
verify(val == datasize);
verify(end != NULL);
@@
-2057,8
+2079,8
@@
int main(int argc, char **argv)
struct test_type_st tests= { true, true };
int total= 0;
int failed= 0;
struct test_type_st tests= { true, true };
int total= 0;
int failed= 0;
- const char *hostname=
"localhost"
;
- const char *port=
"11211"
;
+ const char *hostname=
NULL
;
+ const char *port=
MEMCACHED_DEFAULT_PORT_STRING
;
int cmd;
bool prompt= false;
const char *testname= NULL;
int cmd;
bool prompt= false;
const char *testname= NULL;
@@
-2126,6
+2148,12
@@
int main(int argc, char **argv)
}
}
}
}
+ if (hostname)
+ {
+ fprintf(stderr, "No hostname was provided.\n");
+ return EXIT_FAILURE;
+ }
+
initialize_sockets();
sock= connect_server(hostname, port);
if (sock == INVALID_SOCKET)
initialize_sockets();
sock= connect_server(hostname, port);
if (sock == INVALID_SOCKET)
@@
-2180,12
+2208,24
@@
int main(int argc, char **argv)
reconnect= true;
++failed;
if (verbose)
reconnect= true;
++failed;
if (verbose)
+ {
fprintf(stderr, "\n");
fprintf(stderr, "\n");
+ }
}
else if (ret == TEST_PASS_RECONNECT)
}
else if (ret == TEST_PASS_RECONNECT)
+ {
reconnect= true;
reconnect= true;
+ }
+
+ if (ret == TEST_FAIL)
+ {
+ fprintf(stderr, "%s\n", status_msg[ret]);
+ }
+ else
+ {
+ fprintf(stdout, "%s\n", status_msg[ret]);
+ }
- fprintf(stderr, "%s\n", status_msg[ret]);
if (reconnect)
{
closesocket(sock);
if (reconnect)
{
closesocket(sock);