From e1d7fb406bca9d49488b748e540a8fe1fca19be7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 27 Sep 2013 13:57:02 +0100
Subject: [PATCH] resize, sparsify: Small argument parser refactoring.

Factor out a common string.
---
 resize/resize.ml     | 17 +++++++++--------
 sparsify/sparsify.ml |  7 ++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/resize/resize.ml b/resize/resize.ml
index d74ccbb4f..c3cbddbf2 100644
--- a/resize/resize.ml
+++ b/resize/resize.ml
@@ -78,12 +78,13 @@ let infile, outfile, align_first, alignment, copy_boot_loader,
     else shrink := s
   in
 
+  let ditto = " -\"-" in
   let argspec = Arg.align [
     "--align-first", Arg.Set_string align_first, s_"never|always|auto" ^ " " ^ s_"Align first partition (default: auto)";
     "--alignment", Arg.Set_int alignment,   s_"sectors" ^ " " ^ s_"Set partition alignment (default: 128 sectors)";
     "--no-copy-boot-loader", Arg.Clear copy_boot_loader, " " ^ s_"Don't copy boot loader";
     "-d",        Arg.Set debug,             " " ^ s_"Enable debugging messages";
-    "--debug",   Arg.Set debug,             " -\"-";
+    "--debug",   Arg.Set debug,             ditto;
     "--debug-gc",Arg.Set debug_gc,          " " ^ s_"Debug GC and memory allocations";
     "--delete",  Arg.String (add deletes),  s_"part" ^ " " ^ s_"Delete partition";
     "--expand",  Arg.String set_expand,     s_"part" ^ " " ^ s_"Expand partition";
@@ -93,22 +94,22 @@ let infile, outfile, align_first, alignment, copy_boot_loader,
     "--ignore",  Arg.String (add ignores),  s_"part" ^ " " ^ s_"Ignore partition";
     "--long-options", Arg.Unit display_long_options, " " ^ s_"List long options";
     "--lv-expand", Arg.String (add lv_expands), s_"lv" ^ " " ^ s_"Expand logical volume";
-    "--LV-expand", Arg.String (add lv_expands), s_"lv" ^ " -\"-";
-    "--lvexpand", Arg.String (add lv_expands), s_"lv" ^ " -\"-";
-    "--LVexpand", Arg.String (add lv_expands), s_"lv" ^ " -\"-";
+    "--LV-expand", Arg.String (add lv_expands), s_"lv" ^ ditto;
+    "--lvexpand", Arg.String (add lv_expands), s_"lv" ^ ditto;
+    "--LVexpand", Arg.String (add lv_expands), s_"lv" ^ ditto;
     "--machine-readable", Arg.Set machine_readable, " " ^ s_"Make output machine readable";
     "-n",        Arg.Set dryrun,            " " ^ s_"Don't perform changes";
-    "--dryrun",  Arg.Set dryrun,            " -\"-";
-    "--dry-run", Arg.Set dryrun,            " -\"-";
+    "--dryrun",  Arg.Set dryrun,            ditto;
+    "--dry-run", Arg.Set dryrun,            ditto;
     "--ntfsresize-force", Arg.Set ntfsresize_force, " " ^ s_"Force ntfsresize";
     "--output-format", Arg.Set_string output_format, s_"format" ^ " " ^ s_"Format of output disk";
     "-q",        Arg.Set quiet,             " " ^ s_"Don't print the summary";
-    "--quiet",   Arg.Set quiet,             " -\"-";
+    "--quiet",   Arg.Set quiet,             ditto;
     "--resize",  Arg.String (add resizes),  s_"part=size" ^ " " ^ s_"Resize partition";
     "--resize-force", Arg.String (add resizes_force), s_"part=size" ^ " " ^ s_"Forcefully resize partition";
     "--shrink",  Arg.String set_shrink,     s_"part" ^ " " ^ s_"Shrink partition";
     "-V",        Arg.Unit display_version,  " " ^ s_"Display version and exit";
-    "--version", Arg.Unit display_version,  " -\"-";
+    "--version", Arg.Unit display_version,  ditto;
   ] in
   long_options := argspec;
   let disks = ref [] in
diff --git a/sparsify/sparsify.ml b/sparsify/sparsify.ml
index 4bd7ca050..15ca5e40d 100644
--- a/sparsify/sparsify.ml
+++ b/sparsify/sparsify.ml
@@ -70,6 +70,7 @@ let indisk, outdisk, check_tmpdir, compress, convert, debug_gc,
   let trace = ref false in
   let zeroes = ref [] in
 
+  let ditto = " -\"-" in
   let argspec = Arg.align [
     "--check-tmpdir", Arg.String set_check_tmpdir,  "ignore|..." ^ " " ^ s_"Check there is enough space in $TMPDIR";
     "--compress", Arg.Set compress,         " " ^ s_"Compressed output format";
@@ -81,11 +82,11 @@ let indisk, outdisk, check_tmpdir, compress, convert, debug_gc,
     "--machine-readable", Arg.Set machine_readable, " " ^ s_"Make output machine readable";
     "-o",        Arg.Set_string option,     s_"option" ^ " " ^ s_"Add qemu-img options";
     "-q",        Arg.Set quiet,             " " ^ s_"Quiet output";
-    "--quiet",   Arg.Set quiet,             " -\"-";
+    "--quiet",   Arg.Set quiet,             ditto;
     "-v",        Arg.Set verbose,           " " ^ s_"Enable debugging messages";
-    "--verbose", Arg.Set verbose,           " -\"-";
+    "--verbose", Arg.Set verbose,           ditto;
     "-V",        Arg.Unit display_version,  " " ^ s_"Display version and exit";
-    "--version", Arg.Unit display_version,  " -\"-";
+    "--version", Arg.Unit display_version,  ditto;
     "-x",        Arg.Set trace,             " " ^ s_"Enable tracing of libguestfs calls";
     "--zero",    Arg.String (add zeroes),   s_"fs" ^ " " ^ s_"Zero filesystem";
   ] in