From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjVab-0000RE-Sg for qemu-devel@nongnu.org; Fri, 14 Dec 2012 08:46:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjVaa-0000BE-Fh for qemu-devel@nongnu.org; Fri, 14 Dec 2012 08:46:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjVaa-0000B9-6m for qemu-devel@nongnu.org; Fri, 14 Dec 2012 08:46:08 -0500 Date: Fri, 14 Dec 2012 14:45:53 +0100 From: Igor Mammedov Message-ID: <20121214144553.4a1ca64c@thinkpad.mammed.net> In-Reply-To: <87y5h0bzte.fsf@blackfin.pond.sub.org> References: <1355458116-5692-1-git-send-email-lig.fnst@cn.fujitsu.com> <87y5h0bzte.fsf@blackfin.pond.sub.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] cutils:change strtosz_suffix_unit function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, ehabkost@redhat.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, stefanha@redhat.com, liguang On Fri, 14 Dec 2012 13:09:17 +0100 Markus Armbruster wrote: > liguang writes: > > > if value to be translated is larger than INT64_MAX, > > this function will not be convenient for caller to > > be aware of it, so change a little for this. > > > > Signed-off-by: liguang > > --- > > cutils.c | 3 ++- > > 1 files changed, 2 insertions(+), 1 deletions(-) > > > > diff --git a/cutils.c b/cutils.c > > index 4f0692f..da05c9e 100644 > > --- a/cutils.c > > +++ b/cutils.c > /* > * Convert string to bytes, allowing either B/b for bytes, K/k for KB, > * M/m for MB, G/g for GB or T/t for TB. End pointer will be returned > * in *end, if not NULL. Return -1 on error. > */ Size is not the only user of it, this function is used to convert KHz,... in target-i386/cpu.c, i.e. unit might be something else than 1024. That's why there is question about generalizing strtosz_suffix_unit() in future instead of duplicating suffixed int parsing. And specialization for size with unit=1024 and enforcing limits could be made in strtosz_suffix() which is used by current size users. > > @@ -219,7 +219,7 @@ static int64_t suffix_mul(char suffix, int64_t unit) > > int64_t strtosz_suffix_unit(const char *nptr, char **end, > > const char default_suffix, int64_t unit) > > { > > - int64_t retval = -1; > > + int64_t retval = EINVAL; > > char *endptr; > > unsigned char c; > > int mul_required = 0; > > @@ -246,6 +246,7 @@ int64_t strtosz_suffix_unit(const char *nptr, char **end, > > goto fail; > > } > > if ((val * mul >= INT64_MAX) || val < 0) { > > + retval = ERANGE; > > goto fail; > > } > > retval = val * mul; > > Your error codes aren't negative, and you failed to update the function > comment! Returning negative here is fine for now form target-i386/cpu.c pov. -- Regards, Igor