yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-08 22:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros

Browse source 
Writing QEMU_STRTOSZ_DEFSUFFIX_* instead of '*' gains nothing. Get
rid of these eyesores.

Backports commit 17f942560e54f8ee72996bc3276c697503606d7b from qemu
This commit is contained in:
Markus Armbruster 2018-03-02 08:52:24 -05:00 committed by Lioncash
parent 858acd4142
commit f9c9eb7334
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
qemu/util/cutils.c
View file

@ -127,30 +127,22 @@ char *qemu_strsep(char **input, const char *delim)
return result;
}
#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;
@ -207,17 +199,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);
}
/**