diff options
| author | Per Bothner <per@bothner.com> | 1995-02-02 03:32:52 +0000 |
|---|---|---|
| committer | Per Bothner <per@bothner.com> | 1995-02-02 03:32:52 +0000 |
| commit | 6073b8deba9ef9e2ae3b6da918a63d30de322513 (patch) | |
| tree | b7b9f0f9cc9de82afaaae6ad2779b0a2d4ac22e0 | |
| parent | e3be225eb4b1f6317662be790f67ca8e291ef64f (diff) | |
| download | gdb-6073b8deba9ef9e2ae3b6da918a63d30de322513.zip gdb-6073b8deba9ef9e2ae3b6da918a63d30de322513.tar.gz gdb-6073b8deba9ef9e2ae3b6da918a63d30de322513.tar.bz2 | |
* 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.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/ch-typeprint.c | 2 | ||||
| -rw-r--r-- | gdb/ch-valprint.c | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 44a8e14..b3fc3c0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +Wed Feb 1 15:44:11 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * 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 <shebs@andros.cygnus.com> gcc -Wall lint. diff --git a/gdb/ch-typeprint.c b/gdb/ch-typeprint.c index ce19e68..8474cce 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 91fe459..e6a1502 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); |