From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Mg6TD-0002E3-BY for mharc-grub-devel@gnu.org; Tue, 25 Aug 2009 20:34:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mg6TB-0002DE-Jx for grub-devel@gnu.org; Tue, 25 Aug 2009 20:34:33 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mg6T8-0002B5-0d for grub-devel@gnu.org; Tue, 25 Aug 2009 20:34:33 -0400 Received: from [199.232.76.173] (port=60272 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mg6T7-0002B0-OE for grub-devel@gnu.org; Tue, 25 Aug 2009 20:34:29 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:52027 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mg6T7-0000D2-9N for grub-devel@gnu.org; Tue, 25 Aug 2009 20:34:29 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1Mg6T5-0000ku-T7 for grub-devel@gnu.org; Wed, 26 Aug 2009 02:34:28 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1Mg6T5-0006eD-1A for grub-devel@gnu.org; Wed, 26 Aug 2009 02:34:27 +0200 Date: Wed, 26 Aug 2009 02:34:27 +0200 From: Robert Millan To: The development of GRUB 2 Message-ID: <20090826003427.GD25183@thorin> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: [PATCH] Let user specify OpenBSD root device. X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2009 00:34:33 -0000 On Tue, Aug 25, 2009 at 10:37:33PM +0200, Vladimir 'phcoder' Serbinenko wrote: > + if (cmd->state[OPENBSD_ROOT_ARG].set) > + { > + const char *arg = cmd->state[OPENBSD_ROOT_ARG].arg; > + int unit, part; > + if (*(arg++) != 'w' || *(arg++) != 'd') > + return grub_error (GRUB_ERR_BAD_ARGUMENT, > + "Only device specifications of form " > + "wd are supported."); > + > + unit = grub_strtoul (arg, (char **) &arg, 10); > + if (! (arg && *arg >= 'a' && *arg <= 'z')) > + return grub_error (GRUB_ERR_BAD_ARGUMENT, > + "Only device specifications of form " > + "wd are supported."); Looks like the first error string could be used for both cases, saving a few bytes. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."