From patchwork Thu Mar 6 03:36:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Hecheng X-Patchwork-Id: 3780941 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D6A579F369 for ; Thu, 6 Mar 2014 03:41:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B09020225 for ; Thu, 6 Mar 2014 03:41:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 476A22021B for ; Thu, 6 Mar 2014 03:41:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbaCFDlK (ORCPT ); Wed, 5 Mar 2014 22:41:10 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:33940 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752525AbaCFDkw (ORCPT ); Wed, 5 Mar 2014 22:40:52 -0500 X-IronPort-AV: E=Sophos;i="4.97,597,1389715200"; d="scan'208";a="9652396" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 06 Mar 2014 11:36:57 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s263emOG002080 for ; Thu, 6 Mar 2014 11:40:49 +0800 Received: from localhost.localdomain ([10.167.226.111]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014030611381508-439109 ; Thu, 6 Mar 2014 11:38:15 +0800 From: Gui Hecheng To: linux-btrfs@vger.kernel.org Cc: Gui Hecheng Subject: [PATCH 2/3] btrfs-progs: cleanup device stat usage prompt Date: Thu, 6 Mar 2014 11:36:47 +0800 Message-Id: <1394077008-3568-2-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1394077008-3568-1-git-send-email-guihc.fnst@cn.fujitsu.com> References: <1394077008-3568-1-git-send-email-guihc.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/06 11:38:15, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/06 11:38:15, Serialize complete at 2014/03/06 11:38:15 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 1. use usage() to replace the fprintf() 2. use check_argc_exact() to replace "argc != ..." Signed-off-by: Gui Hecheng --- cmds-device.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index ad59600..5009d9a 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -324,18 +324,13 @@ static int cmd_dev_stats(int argc, char **argv) break; case '?': default: - fprintf(stderr, "ERROR: device stat args invalid.\n" - " device stat [-z] |\n" - " -z to reset stats after reading.\n"); - return 1; + usage(cmd_dev_stats_usage); } } - if (optind + 1 != argc) { - fprintf(stderr, "ERROR: device stat needs path|device as single" - " argument\n"); - return 1; - } + argc = argc - optind; + if (check_argc_exact(argc, 1)) + usage(cmd_dev_stats_usage); dev_path = argv[optind];