[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/2] cutils:change strtosz_suffix_unit function
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 1/2] cutils:change strtosz_suffix_unit function |
Date: |
Fri, 14 Dec 2012 13:09:17 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) |
liguang <address@hidden> 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 <address@hidden>
> ---
> 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.
*/
> @@ -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!