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

Simplify error path code for filter initialization

Browse Source 
Use 'int' counter.
Use 'bad' with goto_bad macro.
This commit is contained in:
Zdenek Kabelac 2012-03-12 14:35:57 +00:00
parent 80a1c93421
commit 57e379d5ee
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/commands/toolcontext.c
View File

@ -730,7 +730,7 @@ static int _init_dev_cache(struct cmd_context *cmd)
static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
{
unsigned nr_filt = 0;
int nr_filt = 0;
const struct dm_config_node *cn;
struct dev_filter *filters[MAX_FILTERS];
struct dev_filter *composite;
@ -761,14 +761,14 @@ static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
else if (!(filters[nr_filt++] = regex_filter_create(cn->v))) {
log_error("Failed to create regex device filter");
goto err;
goto bad;
}
/* device type filter. Required. */
cn = find_config_tree_node(cmd, "devices/types");
if (!(filters[nr_filt++] = lvm_type_filter_create(cmd->proc_dir, cn))) {
log_error("Failed to create lvm type filter");
goto err;
goto bad;
}
/* md component filter. Optional, non-critical. */
@ -790,17 +790,14 @@ static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
if (nr_filt == 1)
return filters[0];
if (!(composite = composite_filter_create(nr_filt, filters))) {
stack;
nr_filt++; /* compensate skip NULL */
goto err;
}
if (!(composite = composite_filter_create(nr_filt, filters)))
goto_bad;
return composite;
err:
nr_filt--; /* skip NULL */
while (nr_filt-- > 0)
bad:
while (--nr_filt >= 0)
filters[nr_filt]->destroy(filters[nr_filt]);
return NULL;
}