diff --git a/programs/fileio.c b/programs/fileio.c index 9d3054b1..b2929558 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -1527,26 +1527,6 @@ FIO_compressZstdFrame(FIO_ctx_t* const fCtx, return compressedfilesize; } -char* human_size(long size, char* str) { - if (size > 1125899906842624L) { - snprintf(str, 7, "%.1fP", (float)size / 1125899906842624L); - } else if (size > 1099511627776L) { - snprintf(str, 7, "%.1fT", (float)size / 1099511627776L); - } else if (size > 1073741824L) { - snprintf(str, 7, "%.1fG", (float)size / 1073741824L); - } else if (size > 1048576L) { - snprintf(str, 7, "%.1fM", (float)size / 1048576L); - } else if (size > 1024) { - snprintf(str, 7, "%.1fK", (float)size / 1024); - } else if (size >= 0) { - snprintf(str, 7, "%dB", size); - } else { - str[0] = '\0'; - } - - return str; -} - /*! FIO_compressFilename_internal() : * same as FIO_compressFilename_extRess(), with `ress.desFile` already opened. * @return : 0 : compression completed correctly, diff --git a/programs/util.c b/programs/util.c index 8d190c62..d942d373 100644 --- a/programs/util.c +++ b/programs/util.c @@ -121,6 +121,27 @@ int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg, * Functions ***************************************/ +char* human_size(long size, char* str) { + if (size > 1125899906842624L) { + snprintf(str, 7, "%.1fP", (float)size / 1125899906842624L); + } else if (size > 1099511627776L) { + snprintf(str, 7, "%.1fT", (float)size / 1099511627776L); + } else if (size > 1073741824L) { + snprintf(str, 7, "%.1fG", (float)size / 1073741824L); + } else if (size > 1048576L) { + snprintf(str, 7, "%.1fM", (float)size / 1048576L); + } else if (size > 1024) { + snprintf(str, 7, "%.1fK", (float)size / 1024); + } else if (size >= 0) { + snprintf(str, 7, "%dB", size); + } else { + str[0] = '\0'; + } + + return str; +} + + int UTIL_stat(const char* filename, stat_t* statbuf) { #if defined(_MSC_VER) diff --git a/programs/util.h b/programs/util.h index 24cce448..415b01f1 100644 --- a/programs/util.h +++ b/programs/util.h @@ -122,6 +122,8 @@ int UTIL_requireUserConfirmation(const char* prompt, const char* abortMsg, const #define STRDUP(s) strdup(s) #endif +char* human_size(long size, char* str); + /** * Calls platform's equivalent of stat() on filename and writes info to statbuf. * Returns success (1) or failure (0).