From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jb4wd-0004h3-VY for mharc-grub-devel@gnu.org; Tue, 19 May 2020 12:18:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb4wb-0004e4-IW for grub-devel@gnu.org; Tue, 19 May 2020 12:18:17 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jb4wZ-0007Lk-PE for grub-devel@gnu.org; Tue, 19 May 2020 12:18:17 -0400 Received: by mail-wr1-x444.google.com with SMTP id h17so35962wrc.8 for ; Tue, 19 May 2020 09:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Vsvm0KvzK6Swu8EQKUo27/aghtq6/bbDuaKhAVadg+k=; b=ZNDGODSsS5o89hAnCf26ADRJmzZwvFnBYaLhcgxtp5Mc2/gtbiR0XnpX3uZaEtrkOn LEOoBpcNAzqTAf4A8F5afUUJ7lUhAnuKUn0MGH+7DMn7PaaeelpIHtU/jYOBu8PxHv4/ CvVBs1wO+/f2eP89zB6iW7u7GZY00kc1rVmKjiTg9rHWn0YbjKiHUxHNQTgGEeI79jRX dh49++wzs4lotPmeY4Xb6VfOjehilKytIgou2M9f1gQ/zAftnk07J2pC4HAgkOS4w5eu Vh0vUtd+E4iblQs1drP7GJm2aCgJIzZhFwTgcYyUYsqVizLSBBNyimzBPnHBtvjdlUli jriQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=Vsvm0KvzK6Swu8EQKUo27/aghtq6/bbDuaKhAVadg+k=; b=ECh5Ai3EfIX+x8XNr/lbnpATC5+ONF+tbYSeQlcH+p0EmqnZ3+EJo7noTa33RViO7T hmhkxi1jMqrB68YL9X63WRT0LgVv2X0D0VSNQGCjLsJSryLCuFz5ne+R9wiUIyt7Lw7n 7O4rwpoeo44ReMZteuopelanawWKm1697vHc2RouwTcR05W6EP41mUyR0xhEb1fFhohV 6eqL1EGMoxKOyykG4BmGEjblcnvGrPaTGXSeIoa10ziobHNXzWS2MVpKOVfd0skEGFxJ PYeq05BbUNh80l+jUfILq3W4opb9P741/kGM/L8MvCTVoxQvoXBOaSJA8E3on8EMFz+H wCdA== X-Gm-Message-State: AOAM531RronCEL/kOHO+XFElzk/c/ntUPi5KR1RjbnSDm+uJoRKxQYhW d5vJ2O31cIK+KW71TqF1naqo1w== X-Google-Smtp-Source: ABdhPJzoVYOz0zz88BW66GOK6Xt/kdR9b3VgM0GivUFIi3DG+efyN5eNhfkEHlUf3nN0DNCq/pTNqA== X-Received: by 2002:adf:fe89:: with SMTP id l9mr26223611wrr.400.1589905094123; Tue, 19 May 2020 09:18:14 -0700 (PDT) Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id v205sm215438wmg.11.2020.05.19.09.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 09:18:13 -0700 (PDT) Date: Tue, 19 May 2020 17:18:11 +0100 From: Leif Lindholm To: Javier Martinez Canillas Cc: grub-devel@gnu.org, Daniel Axtens , Daniel Kiper Subject: Re: [PATCH v2] net: break out nested function Message-ID: <20200519161811.GD1923@vanye> References: <20200519155303.1516941-1-javierm@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200519155303.1516941-1-javierm@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=leif@nuviainc.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2020 16:18:17 -0000 On Tue, May 19, 2020 at 17:53:03 +0200, Javier Martinez Canillas wrote: > Nested functions are not supported in C, but are permitted as an extension > in the GNU C dialect. Commit cb2f15c5448 ("normal/main: Search for specific > config files for netboot") added a nested function which caused the build > to break when compiling with clang. > > Break that out into a static helper function to make the code portable > again. Works for me. Acked-by: Leif Lindholm > Reported-by: Daniel Axtens > Signed-off-by: Javier Martinez Canillas > Tested-by: Daniel Axtens > --- > > Changes in v2: > - Reword subject and commit message as suggested by Leif Lindholm. > - Fix code style issue on function definition. > - Add Daniel Axtens Tested-by tag (thanks!). > > grub-core/net/net.c | 65 +++++++++++++++++++++++---------------------- > 1 file changed, 33 insertions(+), 32 deletions(-) > > diff --git a/grub-core/net/net.c b/grub-core/net/net.c > index c42f0f4f71d..3a310c939b5 100644 > --- a/grub-core/net/net.c > +++ b/grub-core/net/net.c > @@ -1735,42 +1735,43 @@ grub_net_restore_hw (void) > return GRUB_ERR_NONE; > } > > -grub_err_t > -grub_net_search_config_file (char *config) > +static int > +grub_config_search_through (char *config, char *suffix, > + grub_size_t num_tries, grub_size_t slice_size) > { > - grub_size_t config_len; > - char *suffix; > + while (num_tries-- > 0) > + { > + grub_file_t file; > > - auto int search_through (grub_size_t num_tries, grub_size_t slice_size); > - int search_through (grub_size_t num_tries, grub_size_t slice_size) > - { > - while (num_tries-- > 0) > - { > - grub_file_t file; > + grub_dprintf ("net", "attempt to fetch config %s\n", config); > > - grub_dprintf ("net", "attempt to fetch config %s\n", config); > + file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG); > > - file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG); > + if (file) > + { > + grub_file_close (file); > + return 0; > + } > + else > + { > + if (grub_errno == GRUB_ERR_IO) > + grub_errno = GRUB_ERR_NONE; > + } > > - if (file) > - { > - grub_file_close (file); > - return 0; > - } > - else > - { > - if (grub_errno == GRUB_ERR_IO) > - grub_errno = GRUB_ERR_NONE; > - } > + if (grub_strlen (suffix) < slice_size) > + break; > > - if (grub_strlen (suffix) < slice_size) > - break; > + config[grub_strlen (config) - slice_size] = '\0'; > + } > > - config[grub_strlen (config) - slice_size] = '\0'; > - } > + return 1; > +} > > - return 1; > - } > +grub_err_t > +grub_net_search_config_file (char *config) > +{ > + grub_size_t config_len; > + char *suffix; > > config_len = grub_strlen (config); > config[config_len] = '-'; > @@ -1801,7 +1802,7 @@ grub_net_search_config_file (char *config) > if (client_uuid) > { > grub_strcpy (suffix, client_uuid); > - if (search_through (1, 0) == 0) > + if (grub_config_search_through (config, suffix, 1, 0) == 0) > return GRUB_ERR_NONE; > } > > @@ -1816,7 +1817,7 @@ grub_net_search_config_file (char *config) > if (*ptr == ':') > *ptr = '-'; > > - if (search_through (1, 0) == 0) > + if (grub_config_search_through (config, suffix, 1, 0) == 0) > return GRUB_ERR_NONE; > > /* By IP address */ > @@ -1831,7 +1832,7 @@ grub_net_search_config_file (char *config) > ((n >> 24) & 0xff), ((n >> 16) & 0xff), \ > ((n >> 8) & 0xff), ((n >> 0) & 0xff)); > > - if (search_through (8, 1) == 0) > + if (grub_config_search_through (config, suffix, 8, 1) == 0) > return GRUB_ERR_NONE; > break; > } > @@ -1848,7 +1849,7 @@ grub_net_search_config_file (char *config) > *ptr = '-'; > > grub_snprintf (suffix, GRUB_NET_MAX_STR_ADDR_LEN, "%s", buf); > - if (search_through (1, 0) == 0) > + if (grub_config_search_through (config, suffix, 1, 0) == 0) > return GRUB_ERR_NONE; > break; > } > -- > 2.26.2 >