From patchwork Sat Jul 16 15:06:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 649131 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rsCTX2WVFz9snm for ; Sun, 17 Jul 2016 01:07:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3E01DA75A9; Sat, 16 Jul 2016 17:06:57 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qav5vqZfqg2r; Sat, 16 Jul 2016 17:06:57 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DE7CDA75B8; Sat, 16 Jul 2016 17:06:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6B064A74E9 for ; Sat, 16 Jul 2016 17:06:37 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EzWVItYeF1VI for ; Sat, 16 Jul 2016 17:06:37 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail.newtechgroup.ch (mail.newtechgroup.ch [83.144.237.166]) by theia.denx.de (Postfix) with ESMTPS id 2F5D4A7518 for ; Sat, 16 Jul 2016 17:06:37 +0200 (CEST) Received: from localhost (192.168.1.1) by vsrv-mailch01.newtechgroup.local (192.168.1.208) with Microsoft SMTP Server (TLS) id 15.0.775.38; Sat, 16 Jul 2016 17:06:36 +0200 From: Andreas Fenkart To: Date: Sat, 16 Jul 2016 17:06:14 +0200 Message-ID: <1468681575-19671-4-git-send-email-andreas.fenkart@digitalstrom.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1468681575-19671-1-git-send-email-andreas.fenkart@digitalstrom.com> References: <1468681575-19671-1-git-send-email-andreas.fenkart@digitalstrom.com> MIME-Version: 1.0 X-Originating-IP: [192.168.1.1] X-ClientProxiedBy: VSRV-MAILCH01.newtechgroup.local (192.168.1.208) To vsrv-mailch01.newtechgroup.local (192.168.1.208) X-Brightmail-Tracker: H4sIAAAAAAAAC+NgFvrHosTGxXJgBSOjbo1vV7jBhQeHXvFYnHv3ltniQD+/xdcmYwfmAIYo1sy8pPyKBNaMPZt+sBcs5Kv4uP8ccwNjA3cXIyeHkMB6RokV71NBbDYBC4mHd6awgNgiAhISv/qvMoLYzAIREm+fnAOyOTiEBRIltu6yBDFZBFQl2u5YgFTwCgRIHPqzjB3ElhCQk7g8/QEbiM0pECixY8UZZohNARK7ulYyQ9QLSpyc+YQFYrqExMEXL5hBRgoJ6Er0b5eGGBMo8WPlLxYI211i9uvbzBC2vcS6F99YQcolBBwlnnwIhSn5vG0lK4StLbH91T4oW0di+b7pUJfJS/zcuoQJwq6UuPj4MlQ8XqLp6Beo+lCJJwfeMk1glJiF5NBZSA5dwMi0ilGhrLioTDc3MTMnOcPAUC8vtbwkNTkjvSi/tEAvJz85MWcTIyRuLuxgbH7tfohRkoNJSZT3+9HOcCG+pPyUyozE4oz4otKc1OJDjBIcPEoivPXeXeFCvMUFibnFmekwKRkODiUJ3sUgKcGi1PTUirTMnJLUIoj0KUZJKXHeC15ASQGQvozSPLjcJUZRKWHeEiegHE9BalFuZglE/BajMMdDJiGWvPy8VCmgExmAQIPxFaM4B6OSMK8gyCKezLwSuBNeAV3HBHSdtXk7yHUliQgpqQbGehW1Oy3CTVFhO1S7FNtNRB6xXTdskH3X/GA52y2Rv1MmTDI9ffbx1oIfd1a3sjzQnmN6QtHcJVDINGCiFvublvqo3EsV2n9Pflm9Stg+dMrXiNuGa5MjKgoF3m3a4TZP+JJjSd8ugyIF8beN6w4XuMnyT72tp/hfRfASy7ZZxa/X+aye4PlTiaU4I9FQi7moOBEAtRcw7REDAAA= Subject: [U-Boot] [PATCH v2 3/4] tools/env: move envmatch further up in file to avoid forward declarations X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" forward declaration not needed when re-ordered Reviewed-by: Simon Glass Signed-off-by: Andreas Fenkart --- tools/env/fw_env.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index fe479e9..f155c12 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -121,7 +121,6 @@ static unsigned char obsolete_flag = 0; #include static int flash_io (int mode); -static char *envmatch (char * s1, char * s2); static int parse_config(struct env_opts *opts); #if defined(CONFIG_FILE) @@ -147,6 +146,24 @@ static char *skip_blanks(char *s) } /* + * s1 is either a simple 'name', or a 'name=value' pair. + * s2 is a 'name=value' pair. + * If the names match, return the value of s2, else NULL. + */ +static char *envmatch(char *s1, char *s2) +{ + if (s1 == NULL || s2 == NULL) + return NULL; + + while (*s1 == *s2++) + if (*s1++ == '=') + return s2; + if (*s1 == '\0' && *(s2 - 1) == '=') + return s2; + return NULL; +} + +/** * Search the environment for a variable. * Return the value, if found, or NULL, if not found. */ @@ -1121,25 +1138,6 @@ exit: } /* - * s1 is either a simple 'name', or a 'name=value' pair. - * s2 is a 'name=value' pair. - * If the names match, return the value of s2, else NULL. - */ - -static char *envmatch (char * s1, char * s2) -{ - if (s1 == NULL || s2 == NULL) - return NULL; - - while (*s1 == *s2++) - if (*s1++ == '=') - return s2; - if (*s1 == '\0' && *(s2 - 1) == '=') - return s2; - return NULL; -} - -/* * Prevent confusion if running from erased flash memory */ int fw_env_open(struct env_opts *opts)