From df4b9706da57d4b7fed9fbf82bbd41279d480c55 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Tue, 21 Jul 2009 20:00:02 +0000 Subject: [PATCH] Pass struct cmd_context as a first argument to init_multiple_segtypes. Remove redundant assignment seglib.cmd = cmd (done already at the beginning of the function). Signed-off-by: Mikulas Patocka --- WHATS_NEW | 1 + lib/commands/toolcontext.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 2e2ceb833..d1486a1af 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.50 - ================================ + Pass a pointer to struct cmd_context to init_multiple_segtypes Return EINVALID_CMD_LINE not success when invalid VG name format is used. Remove unnecessary messages after vgcreate/vgsplit refactor (2.02.49). Add log_errno to set a specific errno and replace log_error in due course. diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 38ad12366..4683e0002 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -835,7 +835,8 @@ int lvm_register_segtype(struct segtype_library *seglib, return 1; } -static int _init_single_segtype(struct segtype_library *seglib) +static int _init_single_segtype(struct cmd_context *cmd, + struct segtype_library *seglib) { struct segment_type *(*init_segtype_fn) (struct cmd_context *); struct segment_type *segtype; @@ -901,9 +902,8 @@ static int _init_segtypes(struct cmd_context *cmd) (cn = find_config_tree_node(cmd, "global/segment_libraries"))) { struct config_value *cv; - int (*init_multiple_segtypes_fn) (struct segtype_library *); - - seglib.cmd = cmd; + int (*init_multiple_segtypes_fn) (struct cmd_context *, + struct segtype_library *); for (cv = cn->v; cv; cv = cv->next) { if (cv->type != CFG_STRING) { @@ -928,7 +928,7 @@ static int _init_segtypes(struct cmd_context *cmd) init_multiple_segtypes_fn = _init_single_segtype; - if (!init_multiple_segtypes_fn(&seglib)) { + if (!init_multiple_segtypes_fn(cmd, &seglib)) { struct dm_list *sgtl, *tmp; log_error("init_multiple_segtypes() failed: " "Unloading shared library %s",