[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/18] cutils: change strtosz_suffix_unit function
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 14/18] cutils: change strtosz_suffix_unit function |
Date: |
Wed, 19 Dec 2012 16:38:15 +0100 |
From: liguang <address@hidden>
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>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
cutils.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/cutils.c b/cutils.c
index 4f0692f..0433e05 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;
--
1.8.0.2
- [Qemu-devel] [PATCH 02/18] configure: add CONFIG_VIRTIO_BLK_DATA_PLANE, (continued)
- [Qemu-devel] [PATCH 02/18] configure: add CONFIG_VIRTIO_BLK_DATA_PLANE, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 03/18] dataplane: add host memory mapping code, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 04/18] dataplane: add virtqueue vring code, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 06/18] dataplane: add Linux AIO request queue, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 05/18] dataplane: add event loop, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 10/18] virtio-blk: restore VirtIOBlkConf->config_wce flag, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 09/18] iov: add qemu_iovec_concat_iov(), Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 12/18] virtio-blk: add x-data-plane=on|off performance feature, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 11/18] dataplane: add virtio-blk data plane code, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 13/18] virtio-blk: Return UNSUPP for unknown request types, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 14/18] cutils: change strtosz_suffix_unit function,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 16/18] block/raw-win32: Fix compiler warnings (wrong format specifiers), Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 15/18] qemu-img: report size overflow error message, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 08/18] test-iov: add iov_discard_front/back() testcases, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 07/18] iov: add iov_discard_front/back() to remove data, Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 18/18] sheepdog: pass oid directly to send_pending_req(), Stefan Hajnoczi, 2012/12/19
- [Qemu-devel] [PATCH 17/18] sheepdog: don't update inode when create_and_write fails, Stefan Hajnoczi, 2012/12/19