[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/24] util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* mac
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 17/24] util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros |
Date: |
Thu, 23 Feb 2017 20:53:55 +0100 |
Writing QEMU_STRTOSZ_DEFSUFFIX_* instead of '*' gains nothing. Get
rid of these eyesores.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
---
util/cutils.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/util/cutils.c b/util/cutils.c
index 97ec130..0ac8019 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -178,30 +178,22 @@ int fcntl_setfl(int fd, int flag)
}
#endif
-#define QEMU_STRTOSZ_DEFSUFFIX_EB 'E'
-#define QEMU_STRTOSZ_DEFSUFFIX_PB 'P'
-#define QEMU_STRTOSZ_DEFSUFFIX_TB 'T'
-#define QEMU_STRTOSZ_DEFSUFFIX_GB 'G'
-#define QEMU_STRTOSZ_DEFSUFFIX_MB 'M'
-#define QEMU_STRTOSZ_DEFSUFFIX_KB 'K'
-#define QEMU_STRTOSZ_DEFSUFFIX_B 'B'
-
static int64_t suffix_mul(char suffix, int64_t unit)
{
switch (qemu_toupper(suffix)) {
- case QEMU_STRTOSZ_DEFSUFFIX_B:
+ case 'B':
return 1;
- case QEMU_STRTOSZ_DEFSUFFIX_KB:
+ case 'K':
return unit;
- case QEMU_STRTOSZ_DEFSUFFIX_MB:
+ case 'M':
return unit * unit;
- case QEMU_STRTOSZ_DEFSUFFIX_GB:
+ case 'G':
return unit * unit * unit;
- case QEMU_STRTOSZ_DEFSUFFIX_TB:
+ case 'T':
return unit * unit * unit * unit;
- case QEMU_STRTOSZ_DEFSUFFIX_PB:
+ case 'P':
return unit * unit * unit * unit * unit;
- case QEMU_STRTOSZ_DEFSUFFIX_EB:
+ case 'E':
return unit * unit * unit * unit * unit * unit;
}
return -1;
@@ -258,17 +250,17 @@ fail:
int64_t qemu_strtosz(const char *nptr, char **end)
{
- return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_B, 1024);
+ return do_strtosz(nptr, end, 'B', 1024);
}
int64_t qemu_strtosz_MiB(const char *nptr, char **end)
{
- return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_MB, 1024);
+ return do_strtosz(nptr, end, 'M', 1024);
}
int64_t qemu_strtosz_metric(const char *nptr, char **end)
{
- return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_B, 1000);
+ return do_strtosz(nptr, end, 'B', 1000);
}
/**
--
2.7.4
- [Qemu-devel] [PULL 09/24] option: Fix to reject invalid and overflowing numbers, (continued)
- [Qemu-devel] [PULL 09/24] option: Fix to reject invalid and overflowing numbers, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 02/24] option: Assert value string isn't null, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 14/24] util/cutils: New qemu_strtosz_metric(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 13/24] test-cutils: Cover qemu_strtosz() around range limits, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 24/24] option: Fix checking of sizes for overflow and trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 06/24] util/cutils: Rename qemu_strtoll(), qemu_strtoull(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 07/24] util/cutils: Clean up variable names around qemu_strtol(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 08/24] util/cutils: Clean up control flow around qemu_strtol() a bit, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 21/24] util/cutils: Let qemu_strtosz*() optionally reject trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 15/24] util/cutils: Rename qemu_strtosz() to qemu_strtosz_MiB(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 17/24] util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros,
Markus Armbruster <=
- [Qemu-devel] [PULL 20/24] qemu-img: Wrap cvtnum() around qemu_strtosz(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 04/24] test-cutils: Clean up qemu_strtoul() result checks, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 01/24] test-qemu-opts: Cover qemu_opts_parse(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 16/24] util/cutils: New qemu_strtosz(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 18/24] test-cutils: Use qemu_strtosz() more often, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 05/24] util/cutils: Rewrite documentation of qemu_strtol() & friends, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 22/24] util/cutils: Return qemu_strtosz*() error and value separately, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 23/24] util/cutils: Change qemu_strtosz*() from int64_t to uint64_t, Markus Armbruster, 2017/02/23
- Re: [Qemu-devel] [PULL 00/24] option cutils: Fix and clean up number conversions, no-reply, 2017/02/23
- Re: [Qemu-devel] [PULL 00/24] option cutils: Fix and clean up number conversions, Peter Maydell, 2017/02/25