From patchwork Fri May 26 02:54:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 767208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wYrN66Vt8z9s2s for ; Fri, 26 May 2017 12:55:18 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wYrN64BvDzDqn8 for ; Fri, 26 May 2017 12:55:18 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wYrMh6Bq7zDqlM for ; Fri, 26 May 2017 12:54:56 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id 3wYrMh5HnPz9s8H; Fri, 26 May 2017 12:54:56 +1000 (AEST) From: Jeremy Kerr To: skiboot@lists.ozlabs.org Date: Fri, 26 May 2017 12:54:20 +1000 Message-Id: <1495767271-8216-2-git-send-email-jk@ozlabs.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495767271-8216-1-git-send-email-jk@ozlabs.org> References: <1495767271-8216-1-git-send-email-jk@ozlabs.org> Subject: [Skiboot] [PATCH RFC v2 01/12] opal-prd: Simplify optind handling X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dan Crowell MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Increment once, rather than having to use 'optind + 1' on every subsequent usage. Signed-off-by: Jeremy Kerr Reviewed-by: Vasant Hegde --- external/opal-prd/opal-prd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c index 1723924..93419e3 100644 --- a/external/opal-prd/opal-prd.c +++ b/external/opal-prd/opal-prd.c @@ -2042,6 +2042,7 @@ int main(int argc, char *argv[]) rc = parse_action(argv[optind], &action); if (rc) return EXIT_FAILURE; + optind++; } else { action = ACTION_RUN_DAEMON; } @@ -2057,41 +2058,40 @@ int main(int argc, char *argv[]) rc = run_prd_daemon(ctx); break; case ACTION_OCC_CONTROL: - if (optind + 1 >= argc) { + if (optind >= argc) { pr_log(LOG_ERR, "CTRL: occ command requires " "an argument"); return EXIT_FAILURE; } - rc = send_occ_control(ctx, argv[optind + 1]); + rc = send_occ_control(ctx, argv[optind]); break; case ACTION_ATTR_OVERRIDE: - if (optind + 1 >= argc) { + if (optind >= argc) { pr_log(LOG_ERR, "CTRL: attribute override command " "requires an argument"); return EXIT_FAILURE; } - rc = send_attr_override(ctx, argc - optind - 1, &argv[optind + 1]); + rc = send_attr_override(ctx, argc - optind, &argv[optind]); break; case ACTION_HTMGT_PASSTHRU: - if (optind + 1 >= argc) { + if (optind >= argc) { pr_log(LOG_ERR, "CTRL: htmgt passthru requires at least " "one argument"); return EXIT_FAILURE; } - rc = send_htmgt_passthru(ctx, argc - optind - 1, - &argv[optind + 1]); + rc = send_htmgt_passthru(ctx, argc - optind, &argv[optind]); break; case ACTION_RUN_COMMAND: - if (optind + 1 >= argc) { + if (optind >= argc) { pr_log(LOG_ERR, "CTRL: run command requires " "argument(s)"); return EXIT_FAILURE; } - rc = send_run_command(ctx, argc - optind - 1, &argv[optind + 1]); + rc = send_run_command(ctx, argc - optind, &argv[optind]); break; default: break;