From patchwork Fri Jul 19 21:26:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 1134308 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oS33s4ip"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45r40H20Mzz9s4Y for ; Sat, 20 Jul 2019 07:29:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E403CC21DF3; Fri, 19 Jul 2019 21:28:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DB5B1C21D8A; Fri, 19 Jul 2019 21:28:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C55B1C21DE8; Fri, 19 Jul 2019 21:28:19 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by lists.denx.de (Postfix) with ESMTPS id 0B7A8C21DE8 for ; Fri, 19 Jul 2019 21:28:16 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id u25so19853403wmc.4 for ; Fri, 19 Jul 2019 14:28:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YW0k8etiIJ1yxVwR8u6q/Q/EXRvZSKy1wKOtnndyq0A=; b=oS33s4ip2Z0nbfcI2WHD4w7OJt8tuakXhMnIYj7081oLk0kyVZaMO3qAU3m3irX5h2 ofo1biqLZfq5P0pGMlhaVILsoLA7HGWZz2b+3VUwb3desFZSNLHUhlnN5RKKN9EbKnus 9n52fUAuHQR3RazM21vAPMsaxi6Vws9rnN0r9DqJyfttkHAbRTFakqFyWBVFjaOuDmJ+ 9I1rX07JU7FFElO/oY1yxjtMAol398HMvU3hjugp1xRF+WQ/O5YsWis+RpztvzmBeeqB R55PVT7wdS+Ox+i8T4CziftHH21XmDhuLl91xHojTiNKZZu81IRZDIBOrRvFNXt87r97 SREQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YW0k8etiIJ1yxVwR8u6q/Q/EXRvZSKy1wKOtnndyq0A=; b=tyX3eNdz74edW8tESBJpRCb19rDp2rDHti9A5SDks+jwvWUBD1XOeRTjU3aNkiOHWE aLGfEUar5BYpNzdlyZc5gzywFoAyGeHj/ZNpnzvX95tuFc9zHEC/k1r3jyZWq2/76k6T LLVzEDBRW3Zo3sbDA/dLnLctduhR6P3ca3/Icidu4HpKO2i8yiCAU1/1MSrhaEe0Uenv cMeMomLhgNBsdqXVDx/U7pHSMZkreT9fm8GVjpBg/TDlt2H40yv5O4pPkjx5aEEZXboe ePebUCNKCYZKto/VTnJ5B2Kl02SYQqvszADU4MgcUT1jopSo16py9ixl41ZeuoMvEJpD j31Q== X-Gm-Message-State: APjAAAXeL9LJqbDvnqzIF7hMyXDnZ3WiirxHUf4P1j9TfobJrlA/SXkN M/PCbSFakfHjJKf4nR1g6OUpTPDn9Myosw== X-Google-Smtp-Source: APXvYqz1NzMpIMDBxeIEHAvC3sJRGwZ74tTi2sb2PMGPRgdxqvwOYIMm/WxLGyqH0k9Sijzdj2+/GQ== X-Received: by 2002:a7b:c3d7:: with SMTP id t23mr48358275wmj.94.1563571695529; Fri, 19 Jul 2019 14:28:15 -0700 (PDT) Received: from erosca.t-mobile.de ([84.117.13.234]) by smtp.gmail.com with ESMTPSA id 32sm26309800wrh.76.2019.07.19.14.28.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Jul 2019 14:28:15 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: u-boot@lists.denx.de, Simon Glass , Sam Protsenko , Igor Opaniuk , Tom Rini Date: Fri, 19 Jul 2019 23:26:14 +0200 Message-Id: <20190719212614.25527-5-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190719212614.25527-1-erosca@de.adit-jv.com> References: <20190719212614.25527-1-erosca@de.adit-jv.com> MIME-Version: 1.0 Cc: Eugeniu Rosca , Eugeniu Rosca Subject: [U-Boot] [PATCH v3 4/4] cmd: bcb: Apply non-functional refinements X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" These have been reported by Simon in [1] and fixed in [2]. However, since [1] has already been pushed to u-boot/master, the improvements incorporated in [2] are now extracted and resubmitted. The changes are in the area of coding style and best practices: * s/field/fieldp/, s/size/sizep/, to convey that the variables return an output to the caller * s/err_1/err_read_fail/, s/err_2/err_too_small/, to be more descriptive * Made sure 'static int do_bcb_load' appears on the same line * Placed a `/*` on top of multi-line comment [1] https://patchwork.ozlabs.org/patch/1104244/#2200259 [2] https://patchwork.ozlabs.org/cover/1128661/ ("[v4,0/4] Add 'bcb' command to read/modify/write Android BCB") Fixes: db7b7a05b267 ("cmd: Add 'bcb' command to read/modify/write BCB fields") Reported-by: Simon Glass Signed-off-by: Eugeniu Rosca Reviewed-by: Sam Protsenko --- v3: - No changes - Added 'Reviewed-by: Sam Protsenko' from v2 v2: - [Igor Opaniuk] Enriched the patch description - Fixed inconsistent {field,size} variable rename - https://patchwork.ozlabs.org/patch/1131359/ v1: - https://patchwork.ozlabs.org/patch/1131321/ --- cmd/bcb.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/cmd/bcb.c b/cmd/bcb.c index fa9fdeeb0dfc..9626f2c69e34 100644 --- a/cmd/bcb.c +++ b/cmd/bcb.c @@ -83,23 +83,23 @@ err: return -1; } -static int bcb_field_get(char *name, char **field, int *size) +static int bcb_field_get(char *name, char **fieldp, int *sizep) { if (!strcmp(name, "command")) { - *field = bcb.command; - *size = sizeof(bcb.command); + *fieldp = bcb.command; + *sizep = sizeof(bcb.command); } else if (!strcmp(name, "status")) { - *field = bcb.status; - *size = sizeof(bcb.status); + *fieldp = bcb.status; + *sizep = sizeof(bcb.status); } else if (!strcmp(name, "recovery")) { - *field = bcb.recovery; - *size = sizeof(bcb.recovery); + *fieldp = bcb.recovery; + *sizep = sizeof(bcb.recovery); } else if (!strcmp(name, "stage")) { - *field = bcb.stage; - *size = sizeof(bcb.stage); + *fieldp = bcb.stage; + *sizep = sizeof(bcb.stage); } else if (!strcmp(name, "reserved")) { - *field = bcb.reserved; - *size = sizeof(bcb.reserved); + *fieldp = bcb.reserved; + *sizep = sizeof(bcb.reserved); } else { printf("Error: Unknown bcb field '%s'\n", name); return -1; @@ -108,8 +108,8 @@ static int bcb_field_get(char *name, char **field, int *size) return 0; } -static int -do_bcb_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_bcb_load(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) { struct blk_desc *desc; disk_partition_t info; @@ -119,28 +119,28 @@ do_bcb_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ret = blk_get_device_by_str("mmc", argv[1], &desc); if (ret < 0) - goto err_1; + goto err_read_fail; part = simple_strtoul(argv[2], &endp, 0); if (*endp == '\0') { ret = part_get_info(desc, part, &info); if (ret) - goto err_1; + goto err_read_fail; } else { part = part_get_info_by_name(desc, argv[2], &info); if (part < 0) { ret = part; - goto err_1; + goto err_read_fail; } } cnt = DIV_ROUND_UP(sizeof(struct bootloader_message), info.blksz); if (cnt > info.size) - goto err_2; + goto err_too_small; if (blk_dread(desc, info.start, cnt, &bcb) != cnt) { ret = -EIO; - goto err_1; + goto err_read_fail; } bcb_dev = desc->devnum; @@ -148,10 +148,10 @@ do_bcb_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) debug("%s: Loaded from mmc %d:%d\n", __func__, bcb_dev, bcb_part); return CMD_RET_SUCCESS; -err_1: +err_read_fail: printf("Error: mmc %s:%s read failed (%d)\n", argv[1], argv[2], ret); goto err; -err_2: +err_too_small: printf("Error: mmc %s:%s too small!", argv[1], argv[2]); goto err; err: @@ -304,7 +304,8 @@ static int do_bcb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_USAGE; if (bcb_is_misused(argc, argv)) { - /* We try to improve the user experience by reporting the + /* + * We try to improve the user experience by reporting the * root-cause of misusage, so don't return CMD_RET_USAGE, * since the latter prints out the full-blown help text */