Author: sewardj
Date: 2007-11-30 17:50:44 +0000 (Fri, 30 Nov 2007)
New Revision: 7257

Log:
Get rid of VG_NUMW_CLO, as it is pretty much identical to VG_NUM_CLO,
and only used in one place.

Modified:
   trunk/coregrind/m_main.c
   trunk/include/pub_tool_options.h


Modified: trunk/coregrind/m_main.c
===================================================================
--- trunk/coregrind/m_main.c    2007-11-30 17:19:36 UTC (rev 7256)
+++ trunk/coregrind/m_main.c    2007-11-30 17:50:44 UTC (rev 7257)
@@ -368,7 +368,7 @@
       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))

Modified: trunk/include/pub_tool_options.h
===================================================================
--- trunk/include/pub_tool_options.h    2007-11-30 17:19:36 UTC (rev 7256)
+++ trunk/include/pub_tool_options.h    2007-11-30 17:50:44 UTC (rev 7257)
@@ -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"=")) { \


-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers

Reply via email to