summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Buchbinder <abuchbinder@google.com>2014-06-13 14:34:35 -0700
committerDavid Sterba <dsterba@suse.cz>2014-10-10 18:28:28 +0200
commitf404c1ab6cc4cbfa67037cc530714f582127f326 (patch)
treeee43f86b4e22c746ce7e03d430279412ac032bc0
parent6f23efdf27e70964c5a2228b5cea1c20b269846d (diff)
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 <abuchbinder@google.com> Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r--utils.c6
1 files changed, 3 insertions, 3 deletions
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)