diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:14:00 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-23 20:35:36 +0100 |
| commit | 466dea14e677555dd24465aca75d00a3537ad062 (patch) | |
| tree | e1df0ed42f3bbac5bafe441aaad90b3d8ced3a3f /util/cutils.c | |
| parent | e591591b323772eea733de6027f5e8b50692d0ff (diff) | |
util/cutils: New qemu_strtosz()
Most callers of qemu_strtosz_suffix() pass QEMU_STRTOSZ_DEFSUFFIX_B.
Capture the pattern in new qemu_strtosz().
Inline qemu_strtosz_suffix() into its only remaining caller.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1487708048-2131-17-git-send-email-armbru@redhat.com>
Diffstat (limited to 'util/cutils.c')
| -rw-r--r-- | util/cutils.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/util/cutils.c b/util/cutils.c index 9693adde14..97ec130606 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -178,6 +178,14 @@ 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)) { @@ -248,15 +256,14 @@ fail: return retval; } -int64_t qemu_strtosz_suffix(const char *nptr, char **end, - const char default_suffix) +int64_t qemu_strtosz(const char *nptr, char **end) { - return do_strtosz(nptr, end, default_suffix, 1024); + return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_B, 1024); } int64_t qemu_strtosz_MiB(const char *nptr, char **end) { - return qemu_strtosz_suffix(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_MB); + return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_MB, 1024); } int64_t qemu_strtosz_metric(const char *nptr, char **end) |