Patchwork [14/18] cutils: change strtosz_suffix_unit function

login
register
mail settings
Submitter Stefan Hajnoczi
Date Jan. 2, 2013, 3:15 p.m.
Message ID <1357139756-11951-15-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/209084/
State New
Headers show

Comments

Stefan Hajnoczi - Jan. 2, 2013, 3:15 p.m.
From: liguang <lig.fnst@cn.fujitsu.com>

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 <lig.fnst@cn.fujitsu.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 cutils.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/cutils.c b/cutils.c
index d06590b..80bb1dc 100644
--- a/cutils.c
+++ b/cutils.c
@@ -214,12 +214,13 @@  static int64_t suffix_mul(char suffix, int64_t unit)
 /*
  * 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.
+ * in *end, if not NULL. Return -ERANGE on overflow, Return -EINVAL on
+ * other error.
  */
 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 +247,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;