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 X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB032C4338F for ; Thu, 19 Aug 2021 03:48:27 +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 52EBB6108B for ; Thu, 19 Aug 2021 03:48:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 52EBB6108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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 EB589831FC; Thu, 19 Aug 2021 05:46:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="I94BhqXn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C67C683183; Thu, 19 Aug 2021 05:46:32 +0200 (CEST) Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) (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 878C98311F for ; Thu, 19 Aug 2021 05:46:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oi1-x231.google.com with SMTP id r26so6700198oij.2 for ; Wed, 18 Aug 2021 20:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g9kJkQ/FhQly93ZERkCvImKXlZhXzletBbIQyAJ3FZg=; b=I94BhqXnPSh27IcHOs1LP3CsK5ptrFPsApQu1vpheeNTM8xZzGHK+ZKj0aCAbSK7T9 O6I6BxOMfOc53w+iS9cIIha8L8b/QAP9Ciotal9TgVyDxyjayxzj97tGOCdD6TYG3G0e FU/Ca006Qvk75NDNo+NAJjiQOvd1N259Ay8kc= 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=g9kJkQ/FhQly93ZERkCvImKXlZhXzletBbIQyAJ3FZg=; b=KgwshBmG8nwBrHr4eUCKIuW3vF1/TG9NH0ZIZDoE3OocCB6YWnL08wOAs6Nt+FoDOv k2gLbIs/JhFxBiCkXWXhAwP5aONTE4cr8JXQAhnOSEcI+5OrCu9t1IGo9o5BmVoOkxVM dm2gKhZHJF7uAfVKevXUzrHTeyZ1mDC81RhocJBpmwrZHxTyEgA7+R4aHbMstw4JncHv 84TU1RlV1uCi0BoUX49ndtWHJEL6rUoC+rzqIM9tYbfjZ4d7VAwpyNAoeP7jx5x9sTE+ 7U9q+6yPUQ5EXt8361Lv1bQZ4l16ys4Trd6N6s5/Ame1K/jZIUNK3ws11pXqoSmhM+IU df7w== X-Gm-Message-State: AOAM533NH2H5maXqIkLxMxeaay+v3r8YZmPC0MRp0St//gCSYD8cHqf7 1wR7x/byf5Qlqs4AHz4SWgQcwMyrdl9KRw== X-Google-Smtp-Source: ABdhPJz77eAlLXeJRmoiZTMiv+coQbkiCOTnGpTHpaveY+PkFNUs72cCiy6lnK5s+3LinHocdE7Qrw== X-Received: by 2002:aca:aa47:: with SMTP id t68mr1097884oie.25.1629344781645; Wed, 18 Aug 2021 20:46:21 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id q3sm370025ooa.13.2021.08.18.20.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 20:46:21 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Steffen Jaeckel , Michal Simek , Tom Rini , Dennis Gilmore , Daniel Schwierzeck , Lukas Auer , Simon Glass Subject: [PATCH 09/28] pxe: Tidy up code style a little in pxe_utils Date: Wed, 18 Aug 2021 21:45:42 -0600 Message-Id: <20210818214547.9.Ib56ccfab71a5b43d9d35c5d9bd88813e6dfd9ffb@changeid> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog In-Reply-To: <20210819034601.1618773-1-sjg@chromium.org> References: <20210819034601.1618773-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 --- 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.rc1.237.g0d66db33f3-goog