From mboxrd@z Thu Jan 1 00:00:00 1970 From: Horst Kronstorfer Date: Sat, 24 Dec 2011 19:41:04 +0100 Subject: [U-Boot] [PATCH] tools/mkenvimage.c: Fix a merge issue In-Reply-To: <20111224145753.BD5121EA134@gemini.denx.de> References: <1324723318-32752-1-git-send-email-hkronsto@frequentis.com> <20111224145753.BD5121EA134@gemini.denx.de> Message-ID: <4EF61CC0.7070102@aon.at> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 12/24/2011 03:57 PM, Wolfgang Denk wrote: > Dear Horst Kronstorfer, > > In message<1324723318-32752-1-git-send-email-hkronsto@frequentis.com> you wrote: >> With bfcc40bb09b05c90cc3b1496abb270eb8aa72134 'optopt' was reverted. >> >> Signed-off-by: Horst Kronstorfer >> --- >> tools/mkenvimage.c | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c >> index c5ed373..8ee2bd0 100644 >> --- a/tools/mkenvimage.c >> +++ b/tools/mkenvimage.c >> @@ -122,11 +122,11 @@ int main(int argc, char **argv) >> return EXIT_SUCCESS; >> case ':': >> fprintf(stderr, "Missing argument for option -%c\n", >> - option); >> + optopt); >> usage(argv[0]); >> return EXIT_FAILURE; >> default: >> - fprintf(stderr, "Wrong option -%c\n", option); >> + fprintf(stderr, "Wrong option -%c\n", optopt); >> usage(prg); >> return EXIT_FAILURE; > > This change is definitely wrong, as "optopt" is nowhere declared nor > used in tools/mkenvimage.c > 'optopt' is declared in unistd.h ... see 'man 3 getopt.' br -h > > Best regards, > > Wolfgang Denk >