* c-valprint.c (c_value_print): Check for plain literal `char'

	target type when suppressing `(char *)' output for strings.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bae527f9dc10156f0948b716fa9a5abc429f33e9..6b10dbe47db044b7b059e2217138e477f74480a2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov  1 13:00:46 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+       * c-valprint.c (c_value_print):  Check for plain literal `char'
+       target type when suppressing `(char *)' output for strings.
+
 Mon Oct 31 19:19:51 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * coffread.c (coff_symfile_init): Remove unused local abfd.

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index ee98fc46e3f5dcb1b36aed1b07c8c512b39fc2a5..5e5791b12aa8c6aae4140d53ea24116faa986fb7 100644 (file)
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -494,9 +494,9 @@ c_value_print (val, stream, format, pretty)
          /* Hack:  remove (char *) for char strings.  Their
             type is indicated by the quoted string anyway. */
           if (TYPE_CODE (type) == TYPE_CODE_PTR &&
-             TYPE_LENGTH (TYPE_TARGET_TYPE (type)) == sizeof(char) &&
-             TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_INT &&
-             !TYPE_UNSIGNED (TYPE_TARGET_TYPE (type)))
+             TYPE_NAME (type) == NULL &&
+             TYPE_NAME (TYPE_TARGET_TYPE (type)) != NULL &&
+             STREQ (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char"))
            {
                /* Print nothing */
            }