Get rid of VG_NUMW_CLO, as it is pretty much identical to VG_NUM_CLO,

and only used in one place.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7257

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index bf586c166e0fd461fb95a07965d5752fe4cbb30c..ee12b8dfaa0cb954fe65d7089356e063c93392f3 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -368,7 +368,7 @@ static Bool process_cmd_line_options( UInt* client_auxv, const char* toolname )
       else VG_BOOL_CLO(arg, "--error-limit",      VG_(clo_error_limit))
       else VG_NUM_CLO (arg, "--error-exitcode",   VG_(clo_error_exitcode))
       else VG_BOOL_CLO(arg, "--show-emwarns",     VG_(clo_show_emwarns))
-      else VG_NUMW_CLO(arg, "--max-stackframe",   VG_(clo_max_stackframe))
+      else VG_NUM_CLO (arg, "--max-stackframe",   VG_(clo_max_stackframe))
       else VG_BOOL_CLO(arg, "--run-libc-freeres", VG_(clo_run_libc_freeres))
       else VG_BOOL_CLO(arg, "--show-below-main",  VG_(clo_show_below_main))
       else VG_BOOL_CLO(arg, "--time-stamp",       VG_(clo_time_stamp))

diff --git a/include/pub_tool_options.h b/include/pub_tool_options.h
index 7ecac7799c7437956be0dc7cebb356aab82639da..b2701e3fa8192478cf341e634d0c14d607de9c69 100644 (file)
--- a/include/pub_tool_options.h
+++ b/include/pub_tool_options.h
@@ -50,6 +50,7 @@
       (qq_var) = &qq_arg[ VG_(strlen)(qq_option)+1 ]; \
    }
 
+/* Unbounded integer arg */
 #define VG_NUM_CLO(qq_arg, qq_option, qq_var) \
    if (VG_CLO_STREQN(VG_(strlen)(qq_option)+1, qq_arg, qq_option"=")) { \
       Char* s; \
@@ -59,17 +60,6 @@
       if ('\0' != s[0] || (qq_var) != n) VG_(err_bad_option)(qq_arg); \
    }
 
-/* Same as VG_NUM_CLO but does not coerce the result value to 32 bits
-   on 64-bit platforms. */
-#define VG_NUMW_CLO(qq_arg, qq_option, qq_var) \
-   if (VG_CLO_STREQN(VG_(strlen)(qq_option)+1, qq_arg, qq_option"=")) { \
-      Char* s; \
-      Long n = VG_(strtoll10)( &qq_arg[ VG_(strlen)(qq_option)+1 ], &s );\
-      (qq_var) = n; \
-      /* Check for non-numeralness */ \
-      if ('\0' != s[0]) VG_(err_bad_option)(qq_arg); \
-   }
-
 /* Bounded integer arg */
 #define VG_BNUM_CLO(qq_arg, qq_option, qq_var, qq_lo, qq_hi) \
    if (VG_CLO_STREQN(VG_(strlen)(qq_option)+1, qq_arg, qq_option"=")) { \