sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: Slightly simplify logic in conv_str_size

Browse Source
This commit is contained in:
Volker Lendecke 2010-03-28 13:16:58 +02:00
parent ea0f9378a0
commit d77a1fb272
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source3/lib/util_str.c
View File

@ -2003,6 +2003,7 @@ uint64_t STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr)
*/
SMB_OFF_T conv_str_size(const char * str)
{
SMB_OFF_T lval_orig;
SMB_OFF_T lval;
char * end;
@ -2024,35 +2025,38 @@ SMB_OFF_T conv_str_size(const char * str)
return 0;
}
if (*end) {
SMB_OFF_T lval_orig = lval;
if (*end == '\0') {
return lval;
}
if (strwicmp(end, "K") == 0) {
lval *= (SMB_OFF_T)1024;
} else if (strwicmp(end, "M") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024);
} else if (strwicmp(end, "G") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024);
} else if (strwicmp(end, "T") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024 * (SMB_OFF_T)1024);
} else if (strwicmp(end, "P") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024);
} else {
return 0;
}
lval_orig = lval;
/* Primitive attempt to detect wrapping on platforms with
* 4-byte SMB_OFF_T. It's better to let the caller handle
* a failure than some random number.
*/
if (lval_orig <= lval) {
return 0;
}
}
if (strwicmp(end, "K") == 0) {
lval *= (SMB_OFF_T)1024;
} else if (strwicmp(end, "M") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024);
} else if (strwicmp(end, "G") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024);
} else if (strwicmp(end, "T") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024 * (SMB_OFF_T)1024);
} else if (strwicmp(end, "P") == 0) {
lval *= ((SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024 * (SMB_OFF_T)1024 *
(SMB_OFF_T)1024);
} else {
return 0;
}
/*
* Primitive attempt to detect wrapping on platforms with
* 4-byte SMB_OFF_T. It's better to let the caller handle a
* failure than some random number.
*/
if (lval_orig <= lval) {
return 0;
}
return lval;
}