From patchwork Mon Jan 25 22:33:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Salt X-Patchwork-Id: 75125 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0PMXgij023656 for ; Mon, 25 Jan 2010 22:33:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466Ab0AYWdj (ORCPT ); Mon, 25 Jan 2010 17:33:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751977Ab0AYWdj (ORCPT ); Mon, 25 Jan 2010 17:33:39 -0500 Received: from anchor-post-1.mail.demon.net ([195.173.77.132]:39433 "EHLO anchor-post-1.mail.demon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751671Ab0AYWdh (ORCPT ); Mon, 25 Jan 2010 17:33:37 -0500 Received: from youmustbejoking.demon.co.uk ([80.176.152.238] helo=pentagram.youmustbejoking.demon.co.uk) by anchor-post-1.mail.demon.net with esmtp (Exim 4.69) id 1NZXV2-0000TX-iF; Mon, 25 Jan 2010 22:33:36 +0000 Received: from [192.168.0.5] (helo=localhost.localdomain) by pentagram.youmustbejoking.demon.co.uk with esmtp (Exim 4.69) (envelope-from ) id 1NZXV2-0003YF-7S; Mon, 25 Jan 2010 22:33:36 +0000 From: Darren Salt To: Johannes Berg Cc: linux-wireless@vger.kernel.org Subject: [PATCH 2/3] Help text: output rfkill type names from an array instead of a static string. Date: Mon, 25 Jan 2010 22:33:30 +0000 Message-Id: <1264458811-21411-2-git-send-email-linux@youmustbejoking.demon.co.uk> X-Mailer: git-send-email 1.6.5 In-Reply-To: <1264458811-21411-1-git-send-email-linux@youmustbejoking.demon.co.uk> References: <1264458811-21411-1-git-send-email-linux@youmustbejoking.demon.co.uk> X-SA-Exim-Connect-IP: 192.168.0.5 X-SA-Exim-Mail-From: linux@youmustbejoking.demon.co.uk X-SA-Exim-Scanned: No (on pentagram.youmustbejoking.demon.co.uk); SAEximRunCond expanded to false Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/rfkill.c b/rfkill.c index 8fa4c6a..bda649a 100644 --- a/rfkill.c +++ b/rfkill.c @@ -291,6 +291,8 @@ static const char *argv0; static void usage(void) { + const struct rfkill_type_str *p; + fprintf(stderr, "Usage:\t%s [options] command\n", argv0); fprintf(stderr, "Options:\n"); fprintf(stderr, "\t--version\tshow version (%s)\n", rfkill_version); @@ -301,7 +303,10 @@ static void usage(void) fprintf(stderr, "\tblock IDENTIFIER\n"); fprintf(stderr, "\tunblock IDENTIFIER\n"); fprintf(stderr, "where IDENTIFIER is the index no. of an rfkill switch or one of:\n"); - fprintf(stderr, "\t all wifi wlan bluetooth uwb ultrawideband wimax wwan gps\n"); + fprintf(stderr, "\t"); + for (p = rfkill_type_strings; p->name != NULL; p++) + fprintf(stderr, " %s", p->name); + fprintf(stderr, "\n"); } static void version(void)