From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 09 Aug 2022 06:52:30 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oLHEA-00GtxE-3E for lore@lore.pengutronix.de; Tue, 09 Aug 2022 06:52:30 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oLHEB-0004ug-4O for lore@pengutronix.de; Tue, 09 Aug 2022 06:52:27 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TqWINvn6ZflUBAOEID1IiBsb9EZTNsKCp/rc15nkJ9w=; b=eK9JUIPGTTkgGLufgGkrjfvusb D9zeHuptiLohnNU3hL3EJertkxW1BNIAsDY6AuVbI58B3WqMrPisyKQZmK9iU62Ip4d2nMSPm6E3a vMVNS5TilLFZQ1VDJ4oRWBBnqEJAq6toQcQtOeu0Qw1iBMuskeegrRYXlbsjtPOn0E23/eeR6uHKz /dR7wHfkzsfs1zYck2qFyv6J3+TXbzH2bp7FvjZQvnibUJDUT7uVnmiR/zDjsPW0tj/4siLcNZ9a1 0WYMN9z7EP93+jbux71X9BP1O53wwGkhAKQ6cYg46k7tgR5pD5cYf5XaJWd0ZI5ADx+GULV7QK/Y1 0WgMRrgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLHCJ-001Jjb-Tb; Tue, 09 Aug 2022 04:50:32 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLHCG-001Ji2-1O for barebox@bombadil.infradead.org; Tue, 09 Aug 2022 04:50:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=From:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=TqWINvn6ZflUBAOEID1IiBsb9EZTNsKCp/rc15nkJ9w=; b=tEIDAuAPRjdBwkkEBMJiNkFTiC xU3YtMbvsIuHLiU5qGYI7+PA6knQ6fWJL5BaApb74GxWg2psi9bCUcN05yHMR97i4e8+puLp+GiJf kDBudH1VzUsurJCPf273mfJC3KuxPa44qtz4LeAL5AiUP65eCAEx/OB2Bx6CZIT1A5nNDsSPf2Vtq V7phuZMHBS1T90ipAMBakhtCJWi5TQPnMoYBKjke2kmoXexw75uYFGQdUM2L3iZPOeWb3TaSciijf pLtYMO9Hx/YgNppyavRhnOxyGk9K7rNSqwp5ez9C8EgsQeiAnJsmk7ArXyS25/CrThCUJoVRJ5vwz +rMCYKMw==; Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLH39-00Eka8-53 for barebox@lists.infradead.org; Tue, 09 Aug 2022 04:41:05 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oLH38-0003sy-4C; Tue, 09 Aug 2022 06:41:02 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1oLH37-00029E-PS; Tue, 09 Aug 2022 06:41:01 +0200 Date: Tue, 9 Aug 2022 06:41:01 +0200 To: Ahmad Fatoum Cc: barebox@lists.infradead.org Message-ID: <20220809044101.GZ31528@pengutronix.de> References: <20220808062010.390394-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220808062010.390394-1-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220809_054103_241843_D157FCE6 X-CRM114-Status: GOOD ( 18.09 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH master 1/3] common: machine_id: simplify early exit X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On Mon, Aug 08, 2022 at 08:20:08AM +0200, Ahmad Fatoum wrote: > We don't need the goto if we haven't done anything to clean up anyway. > also globalvar_add_simple("machine_id", NULL) is a no-op when we have > just called globalvar_add_simple above with an actual argument. > It doesn't clean the parameter, nor should it, because the code is > executed for the successful code as well and there is nothing that can > fail that late. > > No functional change. > > Signed-off-by: Ahmad Fatoum > --- > common/machine_id.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Applied, thanks Sascha > > diff --git a/common/machine_id.c b/common/machine_id.c > index 6480806cd287..a530fdeb1da8 100644 > --- a/common/machine_id.c > +++ b/common/machine_id.c > @@ -30,11 +30,11 @@ static int machine_id_set_globalvar(void) > unsigned char machine_id[SHA1_DIGEST_SIZE]; > char hex_machine_id[MACHINE_ID_LENGTH]; > char *env_machine_id; > - int ret = 0; > + int ret; > > /* nothing to do if no hashable information provided */ > if (!__machine_id_hashable) > - goto out; > + return 0; > > digest = digest_alloc_by_algo(HASH_ALGO_SHA1); > ret = digest_init(digest); > @@ -58,8 +58,6 @@ static int machine_id_set_globalvar(void) > free(env_machine_id); > > out: > - globalvar_add_simple("machine_id", NULL); > - > digest_free(digest); > return ret; > > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |