shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

libdm: add dm_config_parse_without_dup_node_check

Browse Source 
Introduce function for config parsing tree without checking
for duplicate nodes.
This commit is contained in:
Peter Rajnoha 2016-09-21 14:25:24 +02:00 committed by Zdenek Kabelac
parent 094488ffab
commit 7563e69cf1
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.135 - Version 1.02.135 -
===================================== =====================================
Introduce new dm_config_parse_without_dup_node_check().
Version 1.02.134 - 7th September 2016 Version 1.02.134 - 7th September 2016
===================================== =====================================

1
libdm/.exported_symbols.DM_1_02_135 Normal file
View File

@ -0,0 +1 @@
dm_config_parse_without_dup_node_check

1
libdm/libdevmapper.h
View File

@ -3333,6 +3333,7 @@ struct dm_config_tree {
struct dm_config_tree *dm_config_create(void); struct dm_config_tree *dm_config_create(void);
struct dm_config_tree *dm_config_from_string(const char *config_settings); struct dm_config_tree *dm_config_from_string(const char *config_settings);
int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end); int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end);
int dm_config_parse_without_dup_node_check(struct dm_config_tree *cft, const char *start, const char *end);
void *dm_config_get_custom(struct dm_config_tree *cft); void *dm_config_get_custom(struct dm_config_tree *cft);
void dm_config_set_custom(struct dm_config_tree *cft, void *custom); void dm_config_set_custom(struct dm_config_tree *cft, void *custom);

47
libdm/libdm-config.c
View File

@ -50,6 +50,7 @@ struct parser {
int line; /* line number we are on */ int line; /* line number we are on */
struct dm_pool *mem; struct dm_pool *mem;
int no_dup_node_check; /* whether to disable dup node checking */
}; };
struct config_output { struct config_output {
@ -170,7 +171,7 @@ static struct dm_config_node *_config_reverse(struct dm_config_node *head)
return middle; return middle;
} }
int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end) static int _do_dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end, int no_dup_node_check)
{ {
/* TODO? if (start == end) return 1; */ /* TODO? if (start == end) return 1; */
@ -183,6 +184,7 @@ int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *e
p->fe = end; p->fe = end;
p->tb = p->te = p->fb; p->tb = p->te = p->fb;
p->line = 1; p->line = 1;
p->no_dup_node_check = no_dup_node_check;
_get_token(p, TOK_SECTION_E); _get_token(p, TOK_SECTION_E);
if (!(cft->root = _file(p))) if (!(cft->root = _file(p)))
@ -193,6 +195,16 @@ int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *e
return 1; return 1;
} }
int dm_config_parse(struct dm_config_tree *cft, const char *start, const char *end)
{
return _do_dm_config_parse(cft, start, end, 0);
}
int dm_config_parse_without_dup_node_check(struct dm_config_tree *cft, const char *start, const char *end)
{
return _do_dm_config_parse(cft, start, end, 1);
}
struct dm_config_tree *dm_config_from_string(const char *config_settings) struct dm_config_tree *dm_config_from_string(const char *config_settings)
{ {
struct dm_config_tree *cft; struct dm_config_tree *cft;
@ -509,7 +521,8 @@ static struct dm_config_node *_make_node(struct dm_pool *mem,
/* when mem is not NULL, we create the path if it doesn't exist yet */ /* when mem is not NULL, we create the path if it doesn't exist yet */
static struct dm_config_node *_find_or_make_node(struct dm_pool *mem, static struct dm_config_node *_find_or_make_node(struct dm_pool *mem,
struct dm_config_node *parent, struct dm_config_node *parent,
const char *path) const char *path,
int no_dup_node_check)
{ {
const char *e; const char *e;
struct dm_config_node *cn = parent ? parent->child : NULL; struct dm_config_node *cn = parent ? parent->child : NULL;
@ -526,18 +539,20 @@ static struct dm_config_node *_find_or_make_node(struct dm_pool *mem,
/* hunt for the node */ /* hunt for the node */
cn_found = NULL; cn_found = NULL;
while (cn) { if (!no_dup_node_check) {
if (_tok_match(cn->key, path, e)) { while (cn) {
/* Inefficient */ if (_tok_match(cn->key, path, e)) {
if (!cn_found) /* Inefficient */
cn_found = cn; if (!cn_found)
else cn_found = cn;
log_warn("WARNING: Ignoring duplicate" else
" config node: %s (" log_warn("WARNING: Ignoring duplicate"
"seeking %s)", cn->key, path); " config node: %s ("
} "seeking %s)", cn->key, path);
}
cn = cn->sib; cn = cn->sib;
}
} }
if (!cn_found && mem) { if (!cn_found && mem) {
@ -588,7 +603,7 @@ static struct dm_config_node *_section(struct parser *p, struct dm_config_node *
return NULL; return NULL;
} }
if (!(root = _find_or_make_node(p->mem, parent, str))) if (!(root = _find_or_make_node(p->mem, parent, str, p->no_dup_node_check)))
return_NULL; return_NULL;
if (p->t == TOK_SECTION_B) { if (p->t == TOK_SECTION_B) {
@ -912,7 +927,7 @@ typedef const struct dm_config_node *node_lookup_fn(const void *start, const cha
static const struct dm_config_node *_find_config_node(const void *start, const char *path) { static const struct dm_config_node *_find_config_node(const void *start, const char *path) {
struct dm_config_node dummy = { .child = (void *) start }; struct dm_config_node dummy = { .child = (void *) start };
return _find_or_make_node(NULL, &dummy, path); return _find_or_make_node(NULL, &dummy, path, 0);
} }
static const struct dm_config_node *_find_first_config_node(const void *start, const char *path) static const struct dm_config_node *_find_first_config_node(const void *start, const char *path)
@ -1395,7 +1410,7 @@ static int _override_path(const char *path, struct dm_config_node *node, void *b
struct dm_config_tree *cft = baton; struct dm_config_tree *cft = baton;
struct dm_config_node dummy, *target; struct dm_config_node dummy, *target;
dummy.child = cft->root; dummy.child = cft->root;
if (!(target = _find_or_make_node(cft->mem, &dummy, path))) if (!(target = _find_or_make_node(cft->mem, &dummy, path, 0)))
return_0; return_0;
if (!(target->v = _clone_config_value(cft->mem, node->v))) if (!(target->v = _clone_config_value(cft->mem, node->v)))
return_0; return_0;