From patchwork Sat Dec 24 10:41:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Horst Kronstorfer X-Patchwork-Id: 133157 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 24C28B6FF0 for ; Sat, 24 Dec 2011 22:30:47 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0923C2827A; Sat, 24 Dec 2011 12:30:44 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 zdSp6cqUleku; Sat, 24 Dec 2011 12:30:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4A02428285; Sat, 24 Dec 2011 12:30:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E3EE728285 for ; Sat, 24 Dec 2011 12:30:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 6J-IhmE--Ng5 for ; Sat, 24 Dec 2011 12:30:38 +0100 (CET) X-Greylist: delayed 2907 seconds by postgrey-1.27 at theia; Sat, 24 Dec 2011 12:30:36 CET X-policyd-weight: IN_SBL_XBL_SPAMHAUS=4.35 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from m3f4.kronos.net (178-190-43-237.adsl.highway.telekom.at [178.190.43.237]) by theia.denx.de (Postfix) with ESMTPS id 443BA2827A for ; Sat, 24 Dec 2011 12:30:36 +0100 (CET) Received: from m3f4.kronos.net (m3f4.kronos.net [127.0.0.1]) by m3f4.kronos.net (8.14.5/8.14.5) with ESMTP id pBOAfxvN000326; Sat, 24 Dec 2011 11:41:59 +0100 Received: (from mabuze@localhost) by m3f4.kronos.net (8.14.5/8.14.5/Submit) id pBOAfxvL000325; Sat, 24 Dec 2011 11:41:59 +0100 From: Horst Kronstorfer To: u-boot@lists.denx.de Date: Sat, 24 Dec 2011 11:41:58 +0100 Message-Id: <1324723318-32752-1-git-send-email-hkronsto@frequentis.com> X-Mailer: git-send-email 1.7.7.4 Subject: [U-Boot] [PATCH] tools/mkenvimage.c: Fix a merge issue X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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; }