This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
FYI: fix charset.c build failure
>>>>> "Pierre" == Pierre Muller <muller@ics.u-strasbg.fr> writes:
Pierre> Yes, it fixes the compilation failure for me,
Pierre> thanks for the fact reaction.
Thanks.
Here's the patch I am committing, with a ChangeLog entry.
Tom
2009-03-23 Tom Tromey <tromey@redhat.com>
* charset.c (ICONV_CONST) <PHONY_ICONV>: Define.
(iconv): Make 'inbuf' argument const.
(convert_between_encodings): Use ICONV_CONST.
(wchar_iterate): Likewise.
Index: charset.c
===================================================================
RCS file: /cvs/src/src/gdb/charset.c,v
retrieving revision 1.17
diff -u -r1.17 charset.c
--- charset.c 20 Mar 2009 23:04:30 -0000 1.17
+++ charset.c 23 Mar 2009 17:32:00 -0000
@@ -86,6 +86,9 @@
#undef iconv
#undef iconv_close
+#undef ICONV_CONST
+#define ICONV_CONST const
+
iconv_t
iconv_open (const char *to, const char *from)
{
@@ -109,7 +112,7 @@
}
size_t
-iconv (iconv_t ucs_flag, char **inbuf, size_t *inbytesleft,
+iconv (iconv_t ucs_flag, const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
if (ucs_flag)
@@ -440,7 +443,7 @@
outp = obstack_base (output) + old_size;
outleft = space_request;
- r = iconv (desc, &inp, &inleft, &outp, &outleft);
+ r = iconv (desc, (ICONV_CONST char **) &inp, &inleft, &outp, &outleft);
/* Now make sure that the object on the obstack only includes
bytes we have converted. */
@@ -580,7 +583,8 @@
size_t num;
gdb_wchar_t result;
- size_t r = iconv (iter->desc, (char **) &iter->input, &iter->bytes,
+ size_t r = iconv (iter->desc,
+ (ICONV_CONST char **) &iter->input, &iter->bytes,
&outptr, &out_avail);
if (r == (size_t) -1)
{
Index: dwarf2expr.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2expr.c,v
retrieving revision 1.29
diff -u -r1.29 dwarf2expr.c
--- dwarf2expr.c 3 Jan 2009 05:57:51 -0000 1.29
+++ dwarf2expr.c 23 Mar 2009 17:32:00 -0000
@@ -746,7 +746,7 @@
case DW_OP_GNU_uninit:
if (op_ptr != op_end)
- error (_("DWARF-2 expression error: DW_OP_GNU_unint must always "
+ error (_("DWARF-2 expression error: DW_OP_GNU_uninit must always "
"be the very last op."));
ctx->initialized = 0;