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---
11Upstream-Status: Pending
12
13 dict.h    | 2 +-
14 library.c | 2 +-
15 vect.h    | 2 +-
16 3 files changed, 3 insertions(+), 3 deletions(-)
17
18Index: git/dict.h
19===================================================================
20--- git.orig/dict.h
21+++ git/dict.h
22@@ -90,7 +90,7 @@ int dict_clone(struct dict *target, cons
23 		assert(_source_d->values.elt_size == sizeof(VALUE_TYPE)); \
24 		/* Check that callbacks are typed properly.  */		\
25 		void (*_key_dtor_cb)(KEY_TYPE *, void *) = DTOR_KEY;	\
26-		int (*_key_clone_cb)(KEY_TYPE *, const KEY_TYPE *,	\
27+		int (*_key_clone_cb)(KEY_TYPE *, KEY_TYPE *,	\
28 				     void *) = CLONE_KEY;		\
29 		void (*_value_dtor_cb)(VALUE_TYPE *, void *) = DTOR_VALUE; \
30 		int (*_value_clone_cb)(VALUE_TYPE *, const VALUE_TYPE *, \
31Index: git/library.c
32===================================================================
33--- git.orig/library.c
34+++ git/library.c
35@@ -353,7 +353,7 @@ static void
36 library_exported_names_init(struct library_exported_names *names)
37 {
38 	DICT_INIT(&names->names,
39-		  const char*, uint64_t,
40+		  char*, uint64_t,
41 		  dict_hash_string, dict_eq_string, NULL);
42 	DICT_INIT(&names->addrs,
43 		  uint64_t, struct vect*,
44Index: git/vect.h
45===================================================================
46--- git.orig/vect.h
47+++ git/vect.h
48@@ -66,7 +66,7 @@ int vect_clone(struct vect *target, cons
49 		assert(_source_vec->elt_size == sizeof(ELT_TYPE));	\
50 		/* Check that callbacks are typed properly.  */		\
51 		void (*_dtor_callback)(ELT_TYPE *, void *) = DTOR;	\
52-		int (*_clone_callback)(ELT_TYPE *, const ELT_TYPE *,	\
53+		int (*_clone_callback)(ELT_TYPE *, ELT_TYPE *,	\
54 				       void *) = CLONE;			\
55 		vect_clone((TGT_VEC), _source_vec,			\
56 			   (int (*)(void *, const void *,		\
57Index: git/value_dict.c
58===================================================================
59--- git.orig/value_dict.c
60+++ git/value_dict.c
61@@ -40,7 +40,7 @@ val_dict_init(struct value_dict *dict)
62 }
63
64 static int
65-value_clone_cb(struct value *tgt, const struct value *src, void *data)
66+value_clone_cb(struct value *tgt, struct value *src, void *data)
67 {
68 	return value_clone(tgt, src);
69 }
70@@ -53,7 +53,7 @@ value_dtor(struct value *val, void *data
71
72 static int
73 named_value_clone(struct named_value *tgt,
74-		  const struct named_value *src, void *data)
75+		  struct named_value *src, void *data)
76 {
77 	tgt->name = strdup(src->name);
78 	if (tgt->name == NULL)
79