From 64dff85ce47bd431422022e9afe1a29ead2dc385 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 11 Nov 2010 12:32:33 +0000 Subject: [PATCH] Preserve const for char pointer Keep char pointers 'const' (introduced with cling commit). --- lib/datastruct/str_list.c | 2 +- lib/datastruct/str_list.h | 2 +- lib/metadata/lv_manip.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/datastruct/str_list.c b/lib/datastruct/str_list.c index b71014899..81575cb92 100644 --- a/lib/datastruct/str_list.c +++ b/lib/datastruct/str_list.c @@ -95,7 +95,7 @@ int str_list_match_item(const struct dm_list *sll, const char *str) * Is at least one item on both lists? * If tag_matched is non-NULL, it is set to the tag that matched. */ -int str_list_match_list(const struct dm_list *sll, const struct dm_list *sll2, char **tag_matched) +int str_list_match_list(const struct dm_list *sll, const struct dm_list *sll2, const char **tag_matched) { struct str_list *sl; diff --git a/lib/datastruct/str_list.h b/lib/datastruct/str_list.h index e145bfed2..f7180e21f 100644 --- a/lib/datastruct/str_list.h +++ b/lib/datastruct/str_list.h @@ -20,7 +20,7 @@ struct dm_list *str_list_create(struct dm_pool *mem); int str_list_add(struct dm_pool *mem, struct dm_list *sll, const char *str); int str_list_del(struct dm_list *sll, const char *str); int str_list_match_item(const struct dm_list *sll, const char *str); -int str_list_match_list(const struct dm_list *sll, const struct dm_list *sll2, char **tag_matched); +int str_list_match_list(const struct dm_list *sll, const struct dm_list *sll2, const char **tag_matched); int str_list_lists_equal(const struct dm_list *sll, const struct dm_list *sll2); int str_list_dup(struct dm_pool *mem, struct dm_list *sllnew, const struct dm_list *sllold); diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 1888b7c5d..2d5e08f27 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -959,7 +959,7 @@ static int _has_matching_pv_tag(struct pv_match *pvmatch, struct pv_segment *pvs { struct config_value *cv; char *str; - char *tag_matched; + const char *tag_matched; for (cv = pvmatch->cling_tag_list_cn->v; cv; cv = cv->next) { if (cv->type != CFG_STRING) {