From 2a998fc0370ac0b32051eb31238699d92e1dd81a Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 9 Jul 2013 16:57:09 +0000 Subject: * defs.h (enum val_prettyformat): Renamed from val_prettyprint. Enum values rename as well. All uses updated. * valprint.h (value_print_options): Rename member pretty to pretty format. Rename member prettyprint_arrays to prettyformat_arrays. Rename member prettyprint_structs to prettyformat_structs. All uses updated. (get_no_prettyformat_print_options): Renamed from get_raw_print_options. * valprint.c (get_no_prettyformat_print_options): Renamed from get_raw_print_options. All callers updated. (show_prettyformat_structs): Renamed from show_prettyprint_structs. All callers updated. (show_prettyformat_arrays): Renamed from show_prettyprint_arrays. All callers updated. (_initialize_valprint): Improve help text for "set print pretty" and "set print arrays". testsuite/ * gdb.base/default.exp: Update expected output of "show print array" and "show print pretty". --- gdb/python/py-prettyprint.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gdb/python/py-prettyprint.c') diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 47e9826..2825582 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -511,16 +511,16 @@ print_children (PyObject *printer, const char *hint, } make_cleanup_py_decref (iter); - /* Use the prettyprint_arrays option if we are printing an array, + /* Use the prettyformat_arrays option if we are printing an array, and the pretty option otherwise. */ if (is_array) - pretty = options->prettyprint_arrays; + pretty = options->prettyformat_arrays; else { - if (options->pretty == Val_prettyprint) + if (options->prettyformat == Val_prettyformat) pretty = 1; else - pretty = options->prettyprint_structs; + pretty = options->prettyformat_structs; } /* Manufacture a dummy Python frame to work around Python 2.4 bug, -- cgit v1.1