Adam Buchbinder
2014-Jun-13 21:34 UTC
[PATCH 1/2] 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 <abuchbinder@google.com> --- utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils.c b/utils.c index d29de94..91a7111 100644 --- a/utils.c +++ b/utils.c @@ -1295,9 +1295,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) @@ -1305,7 +1305,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) -- 2.0.0.526.g5318336 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html