From patchwork Sat Feb 19 17:51:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83705 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E4BE5B714D for ; Sun, 20 Feb 2011 04:51:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754221Ab1BSRvc (ORCPT ); Sat, 19 Feb 2011 12:51:32 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:38670 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569Ab1BSRvc (ORCPT ); Sat, 19 Feb 2011 12:51:32 -0500 Received: from vapier.dokuwiki (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 14C8F1B408C; Sat, 19 Feb 2011 17:51:30 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Subject: [PATCH 1/3] tracepath: re-use printf return in print_host Date: Sat, 19 Feb 2011 12:51:27 -0500 Message-Id: <1298137889-23969-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.4.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The printf funcs take an int for field widths, not a size_t. Also, since the printf funcs already return the length of chars displayed, use that value instead of re-calculating the length with strlen. Signed-off-by: Mike Frysinger --- tracepath.c | 11 ++++------- tracepath6.c | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/tracepath.c b/tracepath.c index 81c22e9..ca84a69 100644 --- a/tracepath.c +++ b/tracepath.c @@ -68,13 +68,10 @@ void data_wait(int fd) void print_host(const char *a, const char *b, int both) { - size_t 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 5cc7424..5c2db8f 100644 --- a/tracepath6.c +++ b/tracepath6.c @@ -80,13 +80,10 @@ void data_wait(int fd) void print_host(const char *a, const char *b, int both) { - size_t 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, "");