summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2014-09-23 16:47:27 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2014-09-24 10:54:48 +0200
commit03aeb867621ee5facbc01b95629af29b28c559a5 (patch)
tree51a1e4eb2d1e1e9ceabc0755f9f5ecb3989b95ea
parent3cef6dd721ad79bf73bbf5fa0d381ad7b71e1555 (diff)
downloadlvm2-03aeb867621ee5facbc01b95629af29b28c559a5.tar.gz
cleanup: reindent
Save some code lines.
-rw-r--r--lib/activate/activate.c6
-rw-r--r--tools/vgchange.c5
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 8843ec966..c5ff84d65 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -583,7 +583,7 @@ int module_present(struct cmd_context *cmd, const char *target_name)
int ret = 0;
#ifdef MODPROBE_CMD
char module[128];
- const char *argv[3];
+ const char *argv[] = { MODPROBE_CMD, module, NULL };
if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) {
log_error("module_present module name too long: %s",
@@ -591,10 +591,6 @@ int module_present(struct cmd_context *cmd, const char *target_name)
return 0;
}
- argv[0] = MODPROBE_CMD;
- argv[1] = module;
- argv[2] = NULL;
-
ret = exec_cmd(cmd, argv, NULL, 0);
#endif
return ret;
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 1a597a639..ba66b0f0a 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -40,8 +40,9 @@ static int _monitor_lvs_in_vg(struct cmd_context *cmd,
if (!monitor_dev_for_events(cmd, lv, 0, reg)) {
r = 0;
continue;
- } else
- (*count)++;
+ }
+
+ (*count)++;
}
return r;