Make the 'arg' parameter to VG_BOOL_CLO and similar macros explicit, rather
than implicit.  Also tweak some formatting of command-line arg code.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3453 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/massif/ms_main.c b/massif/ms_main.c
index 6b4661c..7ac1832 100644
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -290,11 +290,11 @@
 
 Bool TL_(process_cmd_line_option)(Char* arg)
 {
-        VG_BOOL_CLO("--heap",       clo_heap)
-   else VG_BOOL_CLO("--stacks",     clo_stacks)
+        VG_BOOL_CLO(arg, "--heap",       clo_heap)
+   else VG_BOOL_CLO(arg, "--stacks",     clo_stacks)
 
-   else VG_NUM_CLO ("--heap-admin",  clo_heap_admin)
-   else VG_BNUM_CLO("--depth",       clo_depth, 1, MAX_DEPTH)
+   else VG_NUM_CLO (arg, "--heap-admin",  clo_heap_admin)
+   else VG_BNUM_CLO(arg, "--depth",       clo_depth, 1, MAX_DEPTH)
 
    else if (VG_CLO_STREQN(11, arg, "--alloc-fn=")) {
       alloc_fns[n_alloc_fns] = & arg[11];