From f404c1ab6cc4cbfa67037cc530714f582127f326 Mon Sep 17 00:00:00 2001 From: Adam Buchbinder Date: Fri, 13 Jun 2014 14:34:35 -0700 Subject: btrfs-progs: Remove extra 'const' modifiers; they don't do anything. 'const int const *x' means the same thing as 'const int *x' or 'int const *x'; the intent was probably 'const int * const x'. However, this won't work for the 'suffix' variable, as it has to be assigned, and making the static tables into const pointers to const chars leads to a mismatch there. This was found with clang's duplicate-decl-specifier warning. Signed-off-by: Adam Buchbinder Signed-off-by: David Sterba --- utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils.c') diff --git a/utils.c b/utils.c index a8634efc..bdb73999 100644 --- a/utils.c +++ b/utils.c @@ -1294,9 +1294,9 @@ out: return ret; } -static const char const *unit_suffix_binary[] = +static const char* unit_suffix_binary[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"}; -static const char const *unit_suffix_decimal[] = +static const char* unit_suffix_decimal[] = { "B", "KB", "MB", "GB", "TB", "PB", "EB"}; int pretty_size_snprintf(u64 size, char *str, size_t str_size, int unit_mode) @@ -1304,7 +1304,7 @@ int pretty_size_snprintf(u64 size, char *str, size_t str_size, int unit_mode) int num_divs; float fraction; int base = 0; - const char const **suffix = NULL; + const char** suffix = NULL; u64 last_size; if (str_size == 0) -- cgit v1.2.3