* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 44a8e14b967d455779e4e0cf0811d15f8b496c8e..b3fc3c0159d1ea6a5d33b42bdcec5b69c81ac81b 100644 (file)
--- 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 ce19e68a63f58b3b76fc9aa821d43eb933c5ef93..8474cce212b84bab2df692f7282ab9692e2189c4 100644 (file)
--- 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 91fe4596f1995c39bcaf048ec0d0c1fc010d7443..e6a15022c8622b1e30048be7aaf4ec7460e393ff 100644 (file)
--- 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);