lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 25 Jan 2013 00:24:10 -0500 From: Mike Frysinger <vapier@...too.org> To: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org> Cc: netdev@...r.kernel.org Subject: [PATCH [iputils] 1/6] tracepath: re-use printf return in print_host Since the printf funcs already return the length of chars displayed, use that value instead of re-calculating the length with strlen. This also fixes the handling of the strlen return -- it's a size_t, not an int. Signed-off-by: Mike Frysinger <vapier@...too.org> --- tracepath.c | 11 ++++------- tracepath6.c | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tracepath.c b/tracepath.c index 8a08f1d..f155816 100644 --- a/tracepath.c +++ b/tracepath.c @@ -73,13 +73,10 @@ void data_wait(int fd) void print_host(const char *a, const char *b, int both) { - int plen = 0; - printf("%s", a); - plen = strlen(a); - if (both) { - printf(" (%s)", b); - plen += strlen(b) + 3; - } + int plen; + plen = printf("%s", a); + if (both) + plen += printf(" (%s)", b); if (plen >= HOST_COLUMN_SIZE) plen = HOST_COLUMN_SIZE - 1; printf("%*s", HOST_COLUMN_SIZE - plen, ""); diff --git a/tracepath6.c b/tracepath6.c index 126fadf..bee95c3 100644 --- a/tracepath6.c +++ b/tracepath6.c @@ -86,13 +86,10 @@ void data_wait(int fd) void print_host(const char *a, const char *b, int both) { - int plen = 0; - printf("%s", a); - plen = strlen(a); - if (both) { - printf(" (%s)", b); - plen += strlen(b) + 3; - } + int plen; + plen = printf("%s", a); + if (both) + plen += printf(" (%s)", b); if (plen >= HOST_COLUMN_SIZE) plen = HOST_COLUMN_SIZE - 1; printf("%*s", HOST_COLUMN_SIZE - plen, ""); -- 1.8.0.2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists