projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating changelog
[m6w6/libmemcached]
/
src
/
memstat.c
diff --git
a/src/memstat.c
b/src/memstat.c
index 8ba59d11b923d4c4c2f59f9fd9f11461f595eab7..6f3c55d80fee6dffa79c6e283090b01cc5537cce 100644
(file)
--- a/
src/memstat.c
+++ b/
src/memstat.c
@@
-4,6
+4,8
@@
#include <sys/types.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <fcntl.h>
+#include <string.h>
+#include <assert.h>
#include <getopt.h>
#include <memcached.h>
#include <getopt.h>
#include <memcached.h>
@@
-33,17
+35,24
@@
int main(int argc, char *argv[])
options_parse(argc, argv);
if (!opt_servers)
options_parse(argc, argv);
if (!opt_servers)
- return 0;
+ {
+ char *temp;
+
+ if ((temp= getenv("MEMCACHED_SERVERS")))
+ opt_servers= strdup(temp);
+ else
+ exit(1);
+ }
- memc= memcached_
init
(NULL);
+ memc= memcached_
create
(NULL);
- servers=
parse_opt_servers
(opt_servers);
+ servers=
memcached_servers_parse
(opt_servers);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
stat= memcached_stat(memc, NULL, &rc);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
stat= memcached_stat(memc, NULL, &rc);
- if (rc != MEMCACHED_SUCCESS
|| rc != MEMCACHED_SOME_ERRORS);
+ if (rc != MEMCACHED_SUCCESS
&& rc != MEMCACHED_SOME_ERRORS)
{
printf("Failure to communicate with servers (%s)\n",
memcached_strerror(memc, rc));
{
printf("Failure to communicate with servers (%s)\n",
memcached_strerror(memc, rc));
@@
-80,7
+89,7
@@
int main(int argc, char *argv[])
free(stat);
free(opt_servers);
free(stat);
free(opt_servers);
- memcached_
deinit
(memc);
+ memcached_
free
(memc);
return 0;
}
return 0;
}