1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mysys: handle T, P, E suffixs

Browse Source 
Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>
This commit is contained in:
Daniel Black 2017-12-05 12:39:37 +11:00 committed by Sergey Vojtovich
parent 22f2b39c14
commit 3464b67025
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mysys/my_getopt.c
View File

@ -969,31 +969,43 @@ my_bool getopt_compare_strings(register const char *s, register const char *t,
/*
function: eval_num_suffix
Transforms suffix like k/m/g to their real value.
Transforms suffix like k/m/g/t/p/e to their real value.
*/
static inline long eval_num_suffix(char *suffix, int *error)
{
long num= 1;
if (*suffix == 'k' || *suffix == 'K')
num*= 1024L;
else if (*suffix == 'm' || *suffix == 'M')
num*= 1024L * 1024L;
else if (*suffix == 'g' || *suffix == 'G')
num*= 1024L * 1024L * 1024L;
else if (*suffix)
static inline ulonglong eval_num_suffix(char *suffix, int *error)
{
switch (*suffix) {
case '\0':
return 1ULL;
case 'k':
case 'K':
return 1ULL << 10;
case 'm':
case 'M':
return 1ULL << 20;
case 'g':
case 'G':
return 1ULL << 30;
case 't':
case 'T':
return 1ULL << 40;
case 'p':
case 'P':
return 1ULL << 50;
case 'e':
case 'E':
return 1ULL << 60;
default:
*error= 1;
return 0;
return 0ULL;
}
return num;
}
/*
function: eval_num_suffix_ll
Transforms a number with a suffix to real number. Suffix can
be k|K for kilo, m|M for mega or g|G for giga.
be k|K for kilo, m|M for mega, etc.
*/
static longlong eval_num_suffix_ll(char *argument,
@ -1026,7 +1038,7 @@ static longlong eval_num_suffix_ll(char *argument,
function: eval_num_suffix_ull
Transforms a number with a suffix to positive Integer. Suffix can
be k|K for kilo, m|M for mega or g|G for giga.
be k|K for kilo, m|M for mega, etc.
*/
static ulonglong eval_num_suffix_ull(char *argument,