From: Yann Collet Date: Thu, 18 Jan 2018 19:27:13 +0000 (-0800) Subject: fileio: READY_FOR_UPDATE() is now a function-like macro X-Git-Tag: v1.3.4~1^2~71^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d08ba8b779e4e653a45102667b04611b0213529;p=thirdparty%2Fzstd.git fileio: READY_FOR_UPDATE() is now a function-like macro as suggested by @terrelln --- diff --git a/programs/fileio.c b/programs/fileio.c index 18552aa3b..7045a5323 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -84,10 +84,10 @@ void FIO_setNotificationLevel(unsigned level) { g_displayLevel=level; } static const U64 g_refreshRate = SEC_TO_MICRO / 6; static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER; -#define READY_FOR_UPDATE (UTIL_clockSpanMicro(g_displayClock) > g_refreshRate) +#define READY_FOR_UPDATE() (UTIL_clockSpanMicro(g_displayClock) > g_refreshRate) #define DISPLAYUPDATE(l, ...) { \ if (g_displayLevel>=l) { \ - if (READY_FOR_UPDATE || (g_displayLevel>=4)) { \ + if (READY_FOR_UPDATE() || (g_displayLevel>=4)) { \ g_displayClock = UTIL_getTime(); DISPLAY(__VA_ARGS__); \ if (g_displayLevel>=4) fflush(stderr); \ } } } @@ -813,7 +813,7 @@ static int FIO_compressFilename_internal(cRess_t ress, } } #if 1 - if (READY_FOR_UPDATE) { + if (READY_FOR_UPDATE()) { ZSTD_frameProgression const zfp = ZSTD_getFrameProgression(ress.cctx); DISPLAYUPDATE(2, "\rRead :%6u MB - Consumed :%6u MB - Compressed :%6u MB => %.2f%%", (U32)(zfp.ingested >> 20),