lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-05 19:15:58 +03:00
Code Activity

Some fixes to address things @felixhandte found

Browse Source
This commit is contained in:
Scott Baker
2021-06-07 09:31:38 -07:00
committed by W. Felix Handte
parent 376a2730a8
commit 1eb852854b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
programs/util.c
View File

@@ -121,8 +121,14 @@ int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg,
* Functions * Functions
***************************************/ ***************************************/
/*
* Take a size in bytes and output a human readable string. Maximum
* buffer size is 8 but it's usually 7. Example: "123.4G"
*/
char* humanSize(unsigned long long size, char* str) { char* humanSize(unsigned long long size, char* str) {
if (size > 1125899906842624L) { if (size > 1152921504606846976L) {
snprintf(str, 7, "%.1fE", (float)size / 1152921504606846976L);
} else if (size > 1125899906842624L) {
snprintf(str, 7, "%.1fP", (float)size / 1125899906842624L); snprintf(str, 7, "%.1fP", (float)size / 1125899906842624L);
} else if (size > 1099511627776L) { } else if (size > 1099511627776L) {
snprintf(str, 7, "%.1fT", (float)size / 1099511627776L); snprintf(str, 7, "%.1fT", (float)size / 1099511627776L);
@@ -134,8 +140,6 @@ char* humanSize(unsigned long long size, char* str) {
snprintf(str, 7, "%.1fK", (float)size / 1024); snprintf(str, 7, "%.1fK", (float)size / 1024);
} else if (size <= 1024) { } else if (size <= 1024) {
snprintf(str, 7, "%lluB", size); snprintf(str, 7, "%lluB", size);
} else {
str[0] = '\0';
} }
return str; return str;

4
programs/util.h
View File

@@ -122,6 +122,10 @@ int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg, const
#define STRDUP(s) strdup(s) #define STRDUP(s) strdup(s)
#endif #endif
/*
* Take a size in bytes and output a human readable string. Maximum
* buffer size is 8 but it's usually 7. Example: "123.4G"
*/
char* humanSize(unsigned long long size, char* str); char* humanSize(unsigned long long size, char* str);
/** /**