diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:14:01 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-23 20:35:36 +0100 |
| commit | 17f942560e54f8ee72996bc3276c697503606d7b (patch) | |
| tree | 1312df22fcd0dbbf06f2df08f116ee1a8cf33a2b | |
| parent | 466dea14e677555dd24465aca75d00a3537ad062 (diff) | |
| download | qemu-17f942560e54f8ee72996bc3276c697503606d7b.zip qemu-17f942560e54f8ee72996bc3276c697503606d7b.tar.gz qemu-17f942560e54f8ee72996bc3276c697503606d7b.tar.bz2 | |
util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros
Writing QEMU_STRTOSZ_DEFSUFFIX_* instead of '*' gains nothing. Get
rid of these eyesores.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1487708048-2131-18-git-send-email-armbru@redhat.com>
| -rw-r--r-- | util/cutils.c | 28 |
1 files 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); } /** |