projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://soup.haus/ Build: jenkins-Libmemcached-472
[awesomized/libmemcached]
/
clients
/
memcapable.cc
diff --git
a/clients/memcapable.cc
b/clients/memcapable.cc
index f914520658aa0324a5ba9b63c270aa231f0b8630..3e9bfabfbf2e9b63136353376b7e7b9359cef4d8 100644
(file)
--- a/
clients/memcapable.cc
+++ b/
clients/memcapable.cc
@@
-186,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);
}
@@
-2078,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;
@@
-2147,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)