gdb/ChangeLog:

2009-11-13  Paul Pluzhnikov  <ppluzhnikov@google.com>

	* python/py-prettyprint.c (print_string_repr): Suppress
	address printing

testsuite/ChangeLog:

2009-11-13  Paul Pluzhnikov  <ppluzhnikov@google.com>

	* gdb.python/py-prettyprint.exp: Adjust.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5111dbc..7bfd1a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-13  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       * python/py-prettyprint.c (print_string_repr): Suppress
+       address printing
+       
 2009-11-13  Tristan Gingold  <gingold@adacore.com>
 
        * avr-tdep.c (avr_push_dummy_call): Fix endianness issue and avoid

diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index 5d696c8..19818e6 100644 (file)
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -209,7 +209,12 @@ print_string_repr (PyObject *printer, const char *hint,
       Py_DECREF (py_str);
     }
   else if (replacement)
-    common_val_print (replacement, stream, recurse, options, language);
+    {
+      struct value_print_options opts = *options;
+
+      opts.addressprint = 0;
+      common_val_print (replacement, stream, recurse, &opts, language);
+    }
   else
     gdbpy_print_stack ();
 }

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4296099..b6d9c79 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-13  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       * gdb.python/py-prettyprint.exp: Adjust.
+       
 2009-11-12  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * lib/cell.exp (skip_cell_tests): Clean up test files before

diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index 14119f0..f8cf36d 100644 (file)
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -99,10 +99,10 @@ proc run_lang_tests {lang} {
        gdb_py_test_silent_cmd "set print elements 200" "" 1
     }
 
-    gdb_test "print x" " = $hex \"this is x\""
-    gdb_test "print cstring" " = $hex \"const string\""
+    gdb_test "print x" " = \"this is x\""
+    gdb_test "print cstring" " = \"const string\""
 
-    gdb_test "print c" " = container $hex \"container\" with 2 elements = {$nl *.0. = 23,$nl *.1. = 72$nl}"
+    gdb_test "print c" " = container \"container\" with 2 elements = {$nl *.0. = 23,$nl *.1. = 72$nl}"
 
     gdb_test "continue" "Program exited normally\."