diff options
| author | Alasdair Kergon <agk@redhat.com> | 2003-04-15 13:22:43 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2003-04-15 13:22:43 +0000 |
| commit | 5beb6fab74b82248bd63318eff47392b9be9b13d (patch) | |
| tree | 165f4b15d512def43a4a8c01a00343449042bf7b | |
| parent | 258c50db740ad5dfb4840383ebcb86b9e3a6f62c (diff) | |
| download | lvm2-5beb6fab74b82248bd63318eff47392b9be9b13d.tar.gz lvm2-5beb6fab74b82248bd63318eff47392b9be9b13d.tar.xz lvm2-5beb6fab74b82248bd63318eff47392b9be9b13d.zip | |
Abort if any filter creation fails.
| -rw-r--r-- | lib/commands/toolcontext.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 889815f5..564658d0 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -140,7 +140,6 @@ static int _process_config(struct cmd_context *cmd) log_error("Device directory given in config file too long"); return 0; } - #ifdef DEVMAPPER_SUPPORT dm_set_dev_dir(cmd->dev_dir); #endif @@ -273,12 +272,12 @@ static struct dev_filter *_init_filter_components(struct cmd_context *cmd) if (!(f1 = regex_filter_create(cn->v))) { log_error("Failed to create regex device filter"); - return f2; + return NULL; } if (!(f3 = composite_filter_create(2, f1, f2))) { log_error("Failed to create composite device filter"); - return f2; + return NULL; } return f3; |