[Ltrace-devel] [PATCH 2/4] Fix clang warning (-Wduplicate-decl-specifier)

Peter Wu lekensteyn at gmail.com
Wed Sep 25 22:55:56 UTC 2013


DICT_INIT defines its key type as constant already, no need to duplicate
that in callers of DICT_INIT.

Signed-off-by: Peter Wu <lekensteyn at gmail.com>
---
 demangle.c  | 2 +-
 output.c    | 2 +-
 prototype.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demangle.c b/demangle.c
index 2d3f195..5b9dcfc 100644
--- a/demangle.c
+++ b/demangle.c
@@ -47,7 +47,7 @@ my_demangle(const char *function_name) {
 	if (name_cache == NULL) {
 		name_cache = malloc(sizeof(*name_cache));
 		if (name_cache != NULL)
-			DICT_INIT(name_cache, const char *, const char *,
+			DICT_INIT(name_cache, char *, const char *,
 				  dict_hash_string, dict_eq_string, NULL);
 	}
 
diff --git a/output.c b/output.c
index 57fc7d0..da8c419 100644
--- a/output.c
+++ b/output.c
@@ -568,7 +568,7 @@ again:
 				options.summary = 0;
 				goto again;
 			}
-			DICT_INIT(dict_opt_c, const char *, struct opt_c_struct,
+			DICT_INIT(dict_opt_c, char *, struct opt_c_struct,
 				  dict_hash_string, dict_eq_string, NULL);
 		}
 
diff --git a/prototype.c b/prototype.c
index 60aa5c6..24e2625 100644
--- a/prototype.c
+++ b/prototype.c
@@ -136,10 +136,10 @@ named_type_destroy(struct named_type *named)
 void
 protolib_init(struct protolib *plib)
 {
-	DICT_INIT(&plib->prototypes, const char *, struct prototype,
+	DICT_INIT(&plib->prototypes, char *, struct prototype,
 		  dict_hash_string, dict_eq_string, NULL);
 
-	DICT_INIT(&plib->named_types, const char *, struct named_type,
+	DICT_INIT(&plib->named_types, char *, struct named_type,
 		  dict_hash_string, dict_eq_string, NULL);
 
 	VECT_INIT(&plib->imports, struct protolib *);
@@ -444,7 +444,7 @@ add_imports_cb(struct opt_F_t *entry, void *data)
 int
 protolib_cache_init(struct protolib_cache *cache, struct protolib *import)
 {
-	DICT_INIT(&cache->protolibs, const char *, struct protolib *,
+	DICT_INIT(&cache->protolibs, char *, struct protolib *,
 		  dict_hash_string, dict_eq_string, NULL);
 	protolib_init(&cache->imports);
 
-- 
1.8.4




More information about the Ltrace-devel mailing list