[SCM] archer-tromey-charset: regression fix

[SCM] archer-tromey-charset: regression fix

[tromey]

The branch, archer-tromey-charset has been updated
       via  d7d90b76d9e9b83980453e5a8c45412f9e253860 (commit)
       via  419703ee94c354b906781df97c7671b89b7bb5a5 (commit)
      from  945acbb547bcb46bf3724822a5b75d1653f2e966 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit d7d90b76d9e9b83980453e5a8c45412f9e253860
Author: Tom Tromey <tromey@redhat.com>
Date:   Sun Jan 18 11:20:11 2009 -0700

    regression fix

commit 419703ee94c354b906781df97c7671b89b7bb5a5
Author: Tom Tromey <tromey@redhat.com>
Date:   Sat Jan 17 17:27:44 2009 -0700

    fix a couple of -O2 build bugs

-----------------------------------------------------------------------

Summary of changes:
 gdb/c-lang.c     |    2 ++
 gdb/c-valprint.c |    2 +-
 gdb/charset.c    |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

First 500 lines of diff:
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 3e508cc..9c621bf 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -752,6 +752,8 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
 	  case C_STRING_32:
 	    type = lookup_typename ("char32_t", NULL, 0);
 	    break;
+	  default:
+	    internal_error (__FILE__, __LINE__, "unhandled c_string_type");
 	  }
 	dest_charset = charset_for_string_type (dest_type);
 
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 00fcc58..3909de4 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -593,7 +593,7 @@ c_value_print (struct value *val, struct ui_file *stream,
          type is indicated by the quoted string anyway.  */
       if (TYPE_CODE (type) == TYPE_CODE_PTR
 	  && TYPE_NAME (type) == NULL
-	  && textual_element_type (val_type, opts.format))
+	  && textual_element_type (TYPE_TARGET_TYPE (val_type), opts.format))
 	{
 	  /* Print nothing */
 	}
diff --git a/gdb/charset.c b/gdb/charset.c
index cc11ebf..414099b 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -404,7 +404,7 @@ struct wchar_iterator
   iconv_t desc;
 
   /* The input string.  This is updated as convert characters.  */
-  const gdb_byte *input;
+  char *input;
   /* The number of bytes remaining in the input.  */
   size_t bytes;
 
@@ -437,7 +437,7 @@ make_wchar_iterator (const gdb_byte *input, size_t bytes, const char *charset,
 
   result = XNEW (struct wchar_iterator);
   result->desc = desc;
-  result->input = input;
+  result->input = (char *) input;
   result->bytes = bytes;
   result->width = width;
 


hooks/post-receive
--
Repository for Project Archer.