From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 694EFC433EF for ; Tue, 9 Nov 2021 08:10:36 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE9DF6112D for ; Tue, 9 Nov 2021 08:10:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DE9DF6112D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 478528391B; Tue, 9 Nov 2021 09:10:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bs466Hmx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DAB9C83907; Tue, 9 Nov 2021 09:10:30 +0100 (CET) Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8043A83923 for ; Tue, 9 Nov 2021 09:10:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rfried.dev@gmail.com Received: by mail-ot1-x330.google.com with SMTP id h16-20020a9d7990000000b0055c7ae44dd2so13709404otm.10 for ; Tue, 09 Nov 2021 00:10:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NSPJLgVa4X+Tqyh2W0SdWgYuYw+TxF3HhAJ9l2ig9SI=; b=bs466HmxSZf/3rVTWDz9YBIeY0bSHwYOwVNvu7hWFuiXVj2pOUZzhEVn+/zpUBB+Kf l24pxj7ptJHc6sKDPGfVKKLJC3helf8Y7w5+8tPCfWnNleYlFV3LzckcsmzZiNWT7jYG eSDyK3SQtv44AAKUjV/ahwS4S8ReH91xadHdwSHtB9E8J8knhqGiqjcTOq12Ixsq0FOD lH0e9tkt/4xSN1LMujEgjyMLp3xygYn9xsq3NFlqdqbomwMuUxtCwnttSwrxSUNfDoN4 UNweip4WpUcCWpTaZnC8OgcL80cT9kjE/NzfM/5SfUAk88L83moIwmm/p0PgmzPjDUlE nIOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NSPJLgVa4X+Tqyh2W0SdWgYuYw+TxF3HhAJ9l2ig9SI=; b=KpIfg0Gwn6DUEqM6yxepnagtplBuHytGPS+Yumu2rw6d30EN6+/4mJ8kD43s5RnXrT JYdUDp37/7uu8/hytvt7ET/xpMpKBBA1dsHSwlddU13J1l/2BE/3jdiX8+9QYUcl8T5A cLYBb6aY0AiV60rYJoGsqpgWPqd/aYSnW5bJokPu9zz/89icPaZ+anyKETVBLlwioCJa XgQ2SRnzgxFZUYDiov88Zz4jHgspee4ypM5ezS64XRUl+SeniN8wnZgPwK9RqIc2y+nr wAdmn4HN7EIz0w4f15rMasqMQUkoHxn2fXKDfPRRzgUF8vWsO6FgUvYuyQvQglJMCnKO zXPA== X-Gm-Message-State: AOAM531EJ7EW4kkEyFNrCfbeJ6WBeNOwW1+OycKMaT2OveCbraRf/cXH Uib+Djl2NmQqajtNYQo3pnXoYAJ63w9U2k1Iqzc= X-Google-Smtp-Source: ABdhPJwVnu/a0aNHbTOyFlZ65KUQNximFbB8dsYJyl1kuP6Wcj+NndGVua1Ps/39OYJdYZmsFjP3K+GsM/fC3/G9RRQ= X-Received: by 2002:a9d:6f09:: with SMTP id n9mr4426015otq.357.1636445423245; Tue, 09 Nov 2021 00:10:23 -0800 (PST) MIME-Version: 1.0 References: <20211014184811.482560-1-sjg@chromium.org> <20211014124803.v3.9.Ib56ccfab71a5b43d9d35c5d9bd88813e6dfd9ffb@changeid> In-Reply-To: <20211014124803.v3.9.Ib56ccfab71a5b43d9d35c5d9bd88813e6dfd9ffb@changeid> From: Ramon Fried Date: Tue, 9 Nov 2021 10:10:12 +0200 Message-ID: Subject: Re: [PATCH v3 09/18] pxe: Tidy up code style a little in pxe_utils To: Simon Glass Cc: U-Boot Mailing List , Patrice Chotard , Artem Lapkin , Tom Rini , Joe Hershberger , Heinrich Schuchardt , Peter Hoyes Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On Thu, Oct 14, 2021 at 9:50 PM Simon Glass wrote: > > There are a few more blank lines than makes sense for readability. Also > free() handles a NULL pointer so drop the pointless checks. > > Signed-off-by: Simon Glass > --- > > (no changes since v1) > > boot/pxe_utils.c | 66 ++++++++++-------------------------------------- > 1 file changed, 13 insertions(+), 53 deletions(-) > > diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c > index 7a2213a5925..9f3edeab06a 100644 > --- a/boot/pxe_utils.c > +++ b/boot/pxe_utils.c > @@ -51,7 +51,6 @@ int format_mac_pxe(char *outbuf, size_t outbuf_len) > > if (outbuf_len < 21) { > printf("outbuf is too small (%zd < 21)\n", outbuf_len); > - > return -ENOSPC; > } > > @@ -91,12 +90,10 @@ static int get_bootfile_path(const char *file_path, char *bootfile_path, > goto ret; > > bootfile = from_env("bootfile"); > - > if (!bootfile) > goto ret; > > last_slash = strrchr(bootfile, '/'); > - > if (!last_slash) > goto ret; > > @@ -140,7 +137,6 @@ static int get_relfile(struct pxe_context *ctx, const char *file_path, > > err = get_bootfile_path(file_path, relfile, sizeof(relfile), > ctx->allow_abs_path); > - > if (err < 0) > return err; > > @@ -181,7 +177,6 @@ int get_pxe_file(struct pxe_context *ctx, const char *file_path, > char *buf; > > err = get_relfile(ctx, file_path, file_addr); > - > if (err < 0) > return err; > > @@ -190,7 +185,6 @@ int get_pxe_file(struct pxe_context *ctx, const char *file_path, > * and add the NUL byte. > */ > tftp_filesize = from_env("filesize"); > - > if (!tftp_filesize) > return -ENOENT; > > @@ -253,7 +247,6 @@ static int get_relfile_envaddr(struct pxe_context *ctx, const char *file_path, > char *envaddr; > > envaddr = from_env(envaddr_name); > - > if (!envaddr) > return -ENOENT; > > @@ -276,7 +269,6 @@ static struct pxe_label *label_create(void) > struct pxe_label *label; > > label = malloc(sizeof(struct pxe_label)); > - > if (!label) > return NULL; > > @@ -300,30 +292,14 @@ static struct pxe_label *label_create(void) > */ > static void label_destroy(struct pxe_label *label) > { > - if (label->name) > - free(label->name); > - > - if (label->kernel) > - free(label->kernel); > - > - if (label->config) > - free(label->config); > - > - if (label->append) > - free(label->append); > - > - if (label->initrd) > - free(label->initrd); > - > - if (label->fdt) > - free(label->fdt); > - > - if (label->fdtdir) > - free(label->fdtdir); > - > - if (label->fdtoverlays) > - free(label->fdtoverlays); > - > + free(label->name); > + free(label->kernel); > + free(label->config); > + free(label->append); > + free(label->initrd); > + free(label->fdt); > + free(label->fdtdir); > + free(label->fdtoverlays); > free(label); > } > > @@ -359,7 +335,6 @@ static int label_localboot(struct pxe_label *label) > char *localcmd; > > localcmd = from_env("localcmd"); > - > if (!localcmd) > return -ENOENT; > > @@ -718,8 +693,8 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) > unmap_sysmem(buf); > > cleanup: > - if (fit_addr) > - free(fit_addr); > + free(fit_addr); > + > return 1; > } > > @@ -832,7 +807,6 @@ static char *get_string(char **p, struct token *t, char delim, int lower) > */ > b = *p; > e = *p; > - > while (*e) { > if ((delim == ' ' && isspace(*e)) || delim == *e) > break; > @@ -858,11 +832,8 @@ static char *get_string(char **p, struct token *t, char delim, int lower) > > t->val[len] = '\0'; > > - /* > - * Update *p so the caller knows where to continue scanning. > - */ > + /* Update *p so the caller knows where to continue scanning */ > *p = e; > - > t->type = T_STRING; > > return t->val; > @@ -988,7 +959,6 @@ static int parse_integer(char **c, int *dst) > char *s = *c; > > get_token(c, &t, L_SLITERAL); > - > if (t.type != T_STRING) { > printf("Expected string: %.*s\n", (int)(*c - s), s); > return -EINVAL; > @@ -1022,14 +992,12 @@ static int handle_include(struct pxe_context *ctx, char **c, unsigned long base, > int ret; > > err = parse_sliteral(c, &include_path); > - > if (err < 0) { > printf("Expected include path: %.*s\n", (int)(*c - s), s); > return err; > } > > err = get_pxe_file(ctx, include_path, base); > - > if (err < 0) { > printf("Couldn't retrieve %s\n", include_path); > return err; > @@ -1079,7 +1047,6 @@ static int parse_menu(struct pxe_context *ctx, char **c, struct pxe_menu *cfg, > printf("Ignoring malformed menu command: %.*s\n", > (int)(*c - s), s); > } > - > if (err < 0) > return err; > > @@ -1353,11 +1320,8 @@ void destroy_pxe_menu(struct pxe_menu *cfg) > struct list_head *pos, *n; > struct pxe_label *label; > > - if (cfg->title) > - free(cfg->title); > - > - if (cfg->default_label) > - free(cfg->default_label); > + free(cfg->title); > + free(cfg->default_label); > > list_for_each_safe(pos, n, &cfg->labels) { > label = list_entry(pos, struct pxe_label, list); > @@ -1375,7 +1339,6 @@ struct pxe_menu *parse_pxefile(struct pxe_context *ctx, unsigned long menucfg) > int r; > > cfg = malloc(sizeof(struct pxe_menu)); > - > if (!cfg) > return NULL; > > @@ -1386,7 +1349,6 @@ struct pxe_menu *parse_pxefile(struct pxe_context *ctx, unsigned long menucfg) > buf = map_sysmem(menucfg, 0); > r = parse_pxefile_top(ctx, buf, menucfg, cfg, 1); > unmap_sysmem(buf); > - > if (r < 0) { > destroy_pxe_menu(cfg); > return NULL; > @@ -1413,7 +1375,6 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) > */ > m = menu_create(cfg->title, DIV_ROUND_UP(cfg->timeout, 10), > cfg->prompt, NULL, label_print, NULL, NULL); > - > if (!m) > return NULL; > > @@ -1492,7 +1453,6 @@ void handle_pxe_menu(struct pxe_context *ctx, struct pxe_menu *cfg) > return; > > err = menu_get_choice(m, &choice); > - > menu_destroy(m); > > /* > -- > 2.33.0.1079.g6e70778dc9-goog > Reviewed-by: Ramon Fried