From 6073b8deba9ef9e2ae3b6da918a63d30de322513 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Thu, 2 Feb 1995 03:32:52 +0000 Subject: [PATCH] * ch-valprint.c (chill_val_print): On TYPE_CODE_STRING, don't print address for non-'s'-formats. * ch-typeprint.c, ch-valprint.c: Use chill_varying_type instead of chill_is_varying_struct. --- gdb/ChangeLog | 7 +++++++ gdb/ch-typeprint.c | 2 +- gdb/ch-valprint.c | 7 +------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 44a8e14b967..b3fc3c0159d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +Wed Feb 1 15:44:11 1995 Per Bothner + + * ch-valprint.c (chill_val_print): On TYPE_CODE_STRING, don't + print address for non-'s'-formats. + * ch-typeprint.c, ch-valprint.c: Use chill_varying_type instead + of chill_is_varying_struct. + Wed Feb 1 13:27:33 1995 Stan Shebs gcc -Wall lint. diff --git a/gdb/ch-typeprint.c b/gdb/ch-typeprint.c index ce19e68a63f..8474cce212b 100644 --- a/gdb/ch-typeprint.c +++ b/gdb/ch-typeprint.c @@ -175,7 +175,7 @@ chill_type_print_base (type, stream, show, level) break; case TYPE_CODE_STRUCT: - if (chill_is_varying_struct (type)) + if (chill_varying_type (type)) { chill_type_print_base (TYPE_FIELD_TYPE (type, 1), stream, show, level); diff --git a/gdb/ch-valprint.c b/gdb/ch-valprint.c index 91fe4596f19..e6a15022c86 100644 --- a/gdb/ch-valprint.c +++ b/gdb/ch-valprint.c @@ -305,11 +305,6 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, break; case TYPE_CODE_STRING: - if (format && format != 's') - { - print_scalar_formatted (valaddr, type, format, 0, stream); - break; - } i = TYPE_LENGTH (type); LA_PRINT_STRING (stream, valaddr, i, 0); /* Return number of characters printed, plus one for the terminating @@ -371,7 +366,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse, break; case TYPE_CODE_STRUCT: - if (chill_is_varying_struct (type)) + if (chill_varying_type (type)) { struct type *inner = TYPE_FIELD_TYPE (type, 1); long length = unpack_long (TYPE_FIELD_TYPE (type, 0), valaddr); -- 2.30.2