From: Dan McGee <[email protected]> Two minor fixups. One is a no-longer needed assert after a conversion from sprintf() to snprintf(); the other failed to use a local udp_port variable that can be derived from two different settings properties.
Signed-off-by: Dan McGee <[email protected]> --- Depending on your compile settings (e.g. -Werror), these can break the compile now. This is for master in case distros/users are rebuilding with newer compliers since there hasn't been a release in quite some time. -Dan McGee items.c | 4 +--- memcached.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/items.c b/items.c index ee1185e..9cfab93 100644 --- a/items.c +++ b/items.c @@ -469,9 +469,7 @@ void do_item_stats_sizes(ADD_STAT add_stats, void *c) { for (i = 0; i < num_buckets; i++) { if (histogram[i] != 0) { char key[8]; - int klen = 0; - klen = snprintf(key, sizeof(key), "%d", i * 32); - assert(klen < sizeof(key)); + snprintf(key, sizeof(key), "%d", i * 32); APPEND_STAT(key, "%u", histogram[i]); } } diff --git a/memcached.c b/memcached.c index 0e96aa9..2c3d06a 100644 --- a/memcached.c +++ b/memcached.c @@ -4769,9 +4769,9 @@ int main (int argc, char **argv) { /* create the UDP listening socket and bind it */ errno = 0; - if (settings.udpport && server_sockets(settings.udpport, udp_transport, + if (udp_port && server_sockets(udp_port, udp_transport, portnumber_file)) { - vperror("failed to listen on UDP port %d", settings.udpport); + vperror("failed to listen on UDP port %d", udp_port); exit(EX_OSERR); } -- 1.7.5.4
