Preparation for an LVM2 liblvm - pass cmd_context into each tool and

link some globals that the tools need into that structure.

1 files changed, 14 insertions, 14 deletions

diff --git a/tools/vgdisplay.c b/tools/vgdisplay.c
index c096d40c6..45a5d5610 100644
--- a/tools/vgdisplay.c
+++ b/tools/vgdisplay.c
@@ -20,16 +20,16 @@
 
 #include "tools.h"
 
-static int vgdisplay_single(const char *vg_name);
+static int vgdisplay_single(struct cmd_context *cmd, const char *vg_name);
 
-int vgdisplay(int argc, char **argv)
+int vgdisplay(struct cmd_context *cmd, int argc, char **argv)
 {
-	if (arg_count(colon_ARG) && arg_count(short_ARG)) {
+	if (arg_count(cmd,colon_ARG) && arg_count(cmd,short_ARG)) {
 		log_error("Option -c is not allowed with option -s");
 		return EINVALID_CMD_LINE;
 	}
 
-	if (argc && arg_count(activevolumegroups_ARG)) {
+	if (argc && arg_count(cmd,activevolumegroups_ARG)) {
 		log_error("Option -A is not allowed with volume group names");
 		return EINVALID_CMD_LINE;
 	}
@@ -45,14 +45,14 @@ int vgdisplay(int argc, char **argv)
 	}
 **********/
 
-	process_each_vg(argc, argv, LCK_READ, &vgdisplay_single);
+	process_each_vg(cmd, argc, argv, LCK_READ, &vgdisplay_single);
 
 /******** FIXME Need to count number processed 
-	  Add this to process_each_vg if arg_count(activevolumegroups_ARG) ? 
+	  Add this to process_each_vg if arg_count(cmd,activevolumegroups_ARG) ? 
 
 	if (opt == argc) {
 		log_print("no ");
-		if (arg_count(activevolumegroups_ARG))
+		if (arg_count(cmd,activevolumegroups_ARG))
 			printf("active ");
 		printf("volume groups found\n\n");
 		return LVM_E_NO_VG;
@@ -62,7 +62,7 @@ int vgdisplay(int argc, char **argv)
 	return 0;
 }
 
-static int vgdisplay_single(const char *vg_name)
+static int vgdisplay_single(struct cmd_context *cmd, const char *vg_name)
 {
 
 	struct volume_group *vg;
@@ -70,7 +70,7 @@ static int vgdisplay_single(const char *vg_name)
 	/* FIXME Do the active check here if activevolumegroups_ARG ? */
 
 	log_very_verbose("Finding volume group \"%s\"", vg_name);
-	if (!(vg = fid->ops->vg_read(fid, vg_name))) {
+	if (!(vg = cmd->fid->ops->vg_read(cmd->fid, vg_name))) {
 		log_error("Volume group \"%s\" doesn't exist", vg_name);
 		return ECMD_FAILED;
 	}
@@ -78,25 +78,25 @@ static int vgdisplay_single(const char *vg_name)
 	if (vg->status & EXPORTED_VG)
 		log_print("WARNING: volume group \"%s\" is exported", vg_name);
 
-	if (arg_count(colon_ARG)) {
+	if (arg_count(cmd,colon_ARG)) {
 		vgdisplay_colons(vg);
 		return 0;
 	}
 
-	if (arg_count(short_ARG)) {
+	if (arg_count(cmd,short_ARG)) {
 		vgdisplay_short(vg);
 		return 0;
 	}
 
 	vgdisplay_full(vg);	/* was vg_show */
 
-	if (arg_count(verbose_ARG)) {
+	if (arg_count(cmd,verbose_ARG)) {
 		vgdisplay_extents(vg);
 
-		process_each_lv_in_vg(vg, &lvdisplay_full);
+		process_each_lv_in_vg(cmd, vg, &lvdisplay_full);
 
 		log_print("--- Physical volumes ---");
-		process_each_pv_in_vg(vg, &pvdisplay_short);
+		process_each_pv_in_vg(cmd, vg, &pvdisplay_short);
 	}
 
 	return 0;