summaryrefslogtreecommitdiffstats
path: root/libdm/libdm-config.c
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2011-08-31 12:39:58 +0000
committerPetr Rockai <prockai@redhat.com>2011-08-31 12:39:58 +0000
commite68a6fbf206050501d4e6489f88fec2c77ceee86 (patch)
tree3a62bf63ebdcf38f07d9b313a531d82c84669997 /libdm/libdm-config.c
parent6e4e30827ddad5772daf53c2c6f74b15d3ad3174 (diff)
downloadlvm2-e68a6fbf206050501d4e6489f88fec2c77ceee86.tar.gz
lvm2-e68a6fbf206050501d4e6489f88fec2c77ceee86.tar.xz
lvm2-e68a6fbf206050501d4e6489f88fec2c77ceee86.zip
Fix warnings and constness handling in lvmetad-core (adjusting the
dm_config_find_node to give non-const node pointer, since that better reflects the contract of that function).
Diffstat (limited to 'libdm/libdm-config.c')
-rw-r--r--libdm/libdm-config.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c
index 688d9a7c..d6a3fe69 100644
--- a/libdm/libdm-config.c
+++ b/libdm/libdm-config.c
@@ -809,8 +809,8 @@ static char *_dup_tok(struct parser *p)
/*
* utility functions
*/
-static const struct dm_config_node *_find_config_node(const void *start,
- const char *path)
+static struct dm_config_node *_find_config_node(const void *start,
+ const char *path)
{
const char *e;
const struct dm_config_node *cn = start;
@@ -848,15 +848,15 @@ static const struct dm_config_node *_find_config_node(const void *start,
path = e;
}
- return cn_found;
+ return (struct dm_config_node *) cn_found;
}
-typedef const struct dm_config_node *_node_lookup_fn(const void *start, const char *path);
+typedef struct dm_config_node *_node_lookup_fn(const void *start, const char *path);
-static const struct dm_config_node *_find_first_config_node(const void *start, const char *path)
+static struct dm_config_node *_find_first_config_node(const void *start, const char *path)
{
const struct dm_config_tree *cft = start;
- const struct dm_config_node *cn = NULL;
+ struct dm_config_node *cn = NULL;
while (cft) {
if ((cn = _find_config_node(cft->root, path)))
@@ -973,8 +973,8 @@ static int _find_config_bool(const void *start, _node_lookup_fn find,
* node-based lookup
**/
-const struct dm_config_node *dm_config_find_node(const struct dm_config_node *cn,
- const char *path)
+struct dm_config_node *dm_config_find_node(const struct dm_config_node *cn,
+ const char *path)
{
return _find_config_node(cn, path);
}