From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 29 Sep 2011 14:26:38 +0000 (+0000)
Subject: Fix a regression (none/tests/cmdline[12]) which was introduced
X-Git-Tag: svn/VALGRIND_3_7_0~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab466bd7b7a09d0723c9f067d0491d70bc617eff;p=thirdparty%2Fvalgrind.git

Fix a regression (none/tests/cmdline[12]) which was introduced
by r12063.
VG_(clo_vgdb_prefix) was used before it was initialized.


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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 49b2daf0ce..ceb852e8fa 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -100,8 +100,10 @@ static void print_all_stats ( void )
 
 static void usage_NORETURN ( Bool debug_help )
 {
-   /* 'usage1' contains a %s for the name of the GDB executable, which
-      must be supplied when it is VG_(printf)'d. */
+   /* 'usage1' contains a %s 
+      - for the name of the GDB executable
+      - for the name of vgdb's path prefix
+      which must be supplied when they are VG_(printf)'d. */
    Char* usage1 = 
 "usage: valgrind [options] prog-and-args\n"
 "\n"
@@ -257,7 +259,7 @@ static void usage_NORETURN ( Bool debug_help )
    /* 'usage1' expects two int, two char* argument, and one SizeT argument. */
    VG_(printf)(usage1, 
                VG_(clo_vgdb_error), gdb_path, VG_MIN_MALLOC_SZB,
-               VG_(clo_vgdb_poll), VG_(clo_vgdb_prefix)); 
+               VG_(clo_vgdb_poll), VG_(vgdb_prefix_default)()); 
    if (VG_(details).name) {
       VG_(printf)("  user options for %s:\n", VG_(details).name);
       if (VG_(needs).command_line_options)