FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* charset.c (ICONV_CONST) <PHONY_ICONV>: Define.

Browse source 
(iconv): Make 'inbuf' argument const.
	(convert_between_encodings): Use ICONV_CONST.
	(wchar_iterate): Likewise.
This commit is contained in:
Tom Tromey 2009-03-23 17:48:09 +00:00
parent ffcfec52d7
commit 0dd7fb99eb
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

@ -1,3 +1,10 @@
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.
2009-03-22 Christopher Faylor <me+cygwin@cgf.cx>
* windows-nat.c (AdjustTokenPrivileges): Implement macro wraparound for

10
gdb/charset.c
View file

@ -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 @@ iconv_close (iconv_t arg)
}
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 @@ convert_between_encodings (const char *from, const char *to,
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 @@ wchar_iterate (struct wchar_iterator *iter,
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)
{