diff options
author | Alasdair Kergon <agk@redhat.com> | 2009-07-13 19:49:48 +0000 |
---|---|---|
committer | Alasdair Kergon <agk@redhat.com> | 2009-07-13 19:49:48 +0000 |
commit | 7f355587f5285ffdf34da8cd96ba81d0db47a8ff (patch) | |
tree | dc142992e5ca3695df877b38e02853dd05e07b53 | |
parent | c944836420b9bec15270af0f4971fde3b5639650 (diff) | |
download | lvm2-7f355587f5285ffdf34da8cd96ba81d0db47a8ff.tar.gz lvm2-7f355587f5285ffdf34da8cd96ba81d0db47a8ff.tar.xz lvm2-7f355587f5285ffdf34da8cd96ba81d0db47a8ff.zip |
Make cmd->cmd_line const.
-rw-r--r-- | WHATS_NEW | 1 | ||||
-rw-r--r-- | daemons/clvmd/lvm-functions.c | 2 | ||||
-rw-r--r-- | lib/commands/toolcontext.h | 2 | ||||
-rw-r--r-- | tools/lvmcmdline.c | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -1,5 +1,6 @@ Version 2.02.49 - ================================ + Make cmd->cmd_line const. Fix dev name mismatch in vgcreate man page example. Refactor vg_remove_single for use in liblvm. Make all tools consistent with lock ordering - obtain VG_ORPHAN lock second. diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 078afd4a..d559b3a1 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -795,7 +795,7 @@ int init_lvm(int using_gulm) /* Use LOG_DAEMON for syslog messages instead of LOG_USER */ init_syslog(LOG_DAEMON); openlog("clvmd", LOG_PID, LOG_DAEMON); - cmd->cmd_line = (char *)"clvmd"; + cmd->cmd_line = "clvmd"; /* Check lvm.conf is setup for cluster-LVM */ check_config(); diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index b5d0e2ee..374b38f1 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -63,7 +63,7 @@ struct cmd_context { const char *kernel_vsn; unsigned rand_seed; - char *cmd_line; + const char *cmd_line; struct command *command; char **argv; unsigned is_long_lived:1; /* Optimises persistent_filter handling */ diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 1ad14d0f..10cbb126 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -918,7 +918,7 @@ static void _apply_settings(struct cmd_context *cmd) cmd->handles_missing_pvs = 0; } -static char *_copy_command_line(struct cmd_context *cmd, int argc, char **argv) +static const char *_copy_command_line(struct cmd_context *cmd, int argc, char **argv) { int i, space; |