diff options
| author | Dustin Sallings <dustin@spy.net> | 2009-03-24 08:16:14 -0700 |
|---|---|---|
| committer | Dustin Sallings <dustin@spy.net> | 2009-03-24 13:17:36 -0700 |
| commit | 0e779f76eda7e901966b3605f5e042e8829e43f5 (patch) | |
| tree | a10328abca154aa159ef07ade2bbf30692947577 | |
| parent | 37369b0d8181ef403e577a5ebe29ab8d5b749e60 (diff) | |
| download | memcached-0e779f76eda7e901966b3605f5e042e8829e43f5.tar.gz | |
Swap APPEND_STAT parameters so that it makes much more sense.
| -rw-r--r-- | memcached.c | 36 | ||||
| -rw-r--r-- | memcached.h | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/memcached.c b/memcached.c index 5ced667..993e478 100644 --- a/memcached.c +++ b/memcached.c @@ -2355,26 +2355,26 @@ static char *process_stat_settings(uint32_t (*add_stats)(char *buf, pos = buf; - APPEND_STAT("%u", "maxbytes", (unsigned int)settings.maxbytes); - APPEND_STAT("%d", "maxconns", settings.maxconns); - APPEND_STAT("%d", "tcpport", settings.port); - APPEND_STAT("%d", "udpport", settings.udpport); - APPEND_STAT("%s", "inter", settings.inter ? settings.inter : "NULL"); - APPEND_STAT("%d", "verbosity", settings.verbose); - APPEND_STAT("%lu", "oldest", (unsigned long)settings.oldest_live); - APPEND_STAT("%s", "evictions", settings.evict_to_free ? "on" : "off"); - APPEND_STAT("%s", "domain_socket", + APPEND_STAT("maxbytes", "%u", (unsigned int)settings.maxbytes); + APPEND_STAT("maxconns", "%d", settings.maxconns); + APPEND_STAT("tcpport", "%d", settings.port); + APPEND_STAT("udpport", "%d", settings.udpport); + APPEND_STAT("inter", "%s", settings.inter ? settings.inter : "NULL"); + APPEND_STAT("verbosity", "%d", settings.verbose); + APPEND_STAT("oldest", "%lu", (unsigned long)settings.oldest_live); + APPEND_STAT("evictions", "%s", settings.evict_to_free ? "on" : "off"); + APPEND_STAT("domain_socket", "%s", settings.socketpath ? settings.socketpath : "NULL"); - APPEND_STAT("%o", "umask", settings.access); - APPEND_STAT("%.2f", "growth_factor", settings.factor); - APPEND_STAT("%d", "chunk_size", settings.chunk_size); - APPEND_STAT("%d", "num_threads", settings.num_threads); - APPEND_STAT("%c", "stat_key_prefix", settings.prefix_delimiter); - APPEND_STAT("%s", "detail_enabled", + APPEND_STAT("umask", "%o", settings.access); + APPEND_STAT("growth_factor", "%.2f", settings.factor); + APPEND_STAT("chunk_size", "%d", settings.chunk_size); + APPEND_STAT("num_threads", "%d", settings.num_threads); + APPEND_STAT("stat_key_prefix", "%c", settings.prefix_delimiter); + APPEND_STAT("detail_enabled", "%s", settings.detail_enabled ? "yes" : "no"); - APPEND_STAT("%d", "reqs_per_event", settings.reqs_per_event); - APPEND_STAT("%s", "cas_enabled", settings.use_cas ? "yes" : "no"); - APPEND_STAT("%d", "tcp_backlog", settings.backlog); + APPEND_STAT("reqs_per_event", "%d", settings.reqs_per_event); + APPEND_STAT("cas_enabled", "%s", settings.use_cas ? "yes" : "no"); + APPEND_STAT("tcp_backlog", "%d", settings.backlog); return buf; } diff --git a/memcached.h b/memcached.h index f4cbdd3..dd8414c 100644 --- a/memcached.h +++ b/memcached.h @@ -178,7 +178,7 @@ typedef struct _stritem { /* Stat processing macros */ /* Append a simple stat with a stat name, value format and value */ -#define APPEND_STAT(fmt, name, val) \ +#define APPEND_STAT(name, fmt, val) \ vlen = sprintf(val_str, fmt, val); \ size = add_stats(pos, name, strlen(name), val_str, vlen, c); \ *buflen += size; \ |