1From 4d3ec1a514f9b1df8ce3a1b04c8a2823d977377f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Mar 2017 21:34:01 -0800
4Subject: [PATCH 2/2] Fix const qualifier error
5
6Fixes clang warning
7error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifier]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 dict.h    | 2 +-
12 library.c | 2 +-
13 vect.h    | 2 +-
14 3 files changed, 3 insertions(+), 3 deletions(-)
15
16Index: git/dict.h
17===================================================================
18--- git.orig/dict.h
19+++ git/dict.h
20@@ -90,7 +90,7 @@ int dict_clone(struct dict *target, cons
21 		assert(_source_d->values.elt_size == sizeof(VALUE_TYPE)); \
22 		/* Check that callbacks are typed properly.  */		\
23 		void (*_key_dtor_cb)(KEY_TYPE *, void *) = DTOR_KEY;	\
24-		int (*_key_clone_cb)(KEY_TYPE *, const KEY_TYPE *,	\
25+		int (*_key_clone_cb)(KEY_TYPE *, KEY_TYPE *,	\
26 				     void *) = CLONE_KEY;		\
27 		void (*_value_dtor_cb)(VALUE_TYPE *, void *) = DTOR_VALUE; \
28 		int (*_value_clone_cb)(VALUE_TYPE *, const VALUE_TYPE *, \
29Index: git/library.c
30===================================================================
31--- git.orig/library.c
32+++ git/library.c
33@@ -353,7 +353,7 @@ static void
34 library_exported_names_init(struct library_exported_names *names)
35 {
36 	DICT_INIT(&names->names,
37-		  const char*, uint64_t,
38+		  char*, uint64_t,
39 		  dict_hash_string, dict_eq_string, NULL);
40 	DICT_INIT(&names->addrs,
41 		  uint64_t, struct vect*,
42Index: git/vect.h
43===================================================================
44--- git.orig/vect.h
45+++ git/vect.h
46@@ -66,7 +66,7 @@ int vect_clone(struct vect *target, cons
47 		assert(_source_vec->elt_size == sizeof(ELT_TYPE));	\
48 		/* Check that callbacks are typed properly.  */		\
49 		void (*_dtor_callback)(ELT_TYPE *, void *) = DTOR;	\
50-		int (*_clone_callback)(ELT_TYPE *, const ELT_TYPE *,	\
51+		int (*_clone_callback)(ELT_TYPE *, ELT_TYPE *,	\
52 				       void *) = CLONE;			\
53 		vect_clone((TGT_VEC), _source_vec,			\
54 			   (int (*)(void *, const void *,		\
55Index: git/value_dict.c
56===================================================================
57--- git.orig/value_dict.c
58+++ git/value_dict.c
59@@ -40,7 +40,7 @@ val_dict_init(struct value_dict *dict)
60 }
61
62 static int
63-value_clone_cb(struct value *tgt, const struct value *src, void *data)
64+value_clone_cb(struct value *tgt, struct value *src, void *data)
65 {
66 	return value_clone(tgt, src);
67 }
68@@ -53,7 +53,7 @@ value_dtor(struct value *val, void *data
69
70 static int
71 named_value_clone(struct named_value *tgt,
72-		  const struct named_value *src, void *data)
73+		  struct named_value *src, void *data)
74 {
75 	tgt->name = strdup(src->name);
76 	if (tgt->name == NULL)
77