From bc75d2ecdf6fedb17ca474d4d30fb66b4ccd4cd4 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen Date: Thu, 20 Nov 2014 21:48:04 +0100 Subject: [PATCH] Fix code for undefined USE_NLS_PROGRESS_BAR in progress.c Reported-by: Gisle Vanem --- src/ChangeLog | 6 ++++++ src/progress.c | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9c72a8ab..98c47b5e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-11-20 Tim Ruehsen + + * progress.c: Fix code for undefined USE_NLS_PROGRESS_BAR + + Reported-by: Gisle Vanem + 2014-11-20 Gisle Vanem * build_info.c.in: Assume large file for WINDOWS diff --git a/src/progress.c b/src/progress.c index aa988301..479eaffa 100644 --- a/src/progress.c +++ b/src/progress.c @@ -840,11 +840,13 @@ cols_to_bytes (const char *mbs, const int cols, int *ncols) return bytes; } #else -# define count_cols(mbs) ((int)(strlen(mbs))) -# define cols_to_bytes(mbs, cols, *ncols) do { \ - *ncols = cols; \ - bytes = cols; \ -}while (0) +static int count_cols (const char *mbs) { return (int) strlen(mbs); } +static int +cols_to_bytes (const char *mbs _GL_UNUSED, const int cols, int *ncols) +{ + *ncols = cols; + return cols; +} #endif static const char *