qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2001-03-09  Bruno Haible  <haible@clisp.cons.org>

	* intl/dcigettext.c (transmem_block_t): Change to unsigned char, to
	avoid compiler warning.
	(_nl_find_msg): Add casts to avoid compiler warnings.
This commit is contained in:
Ulrich Drepper 2001-03-21 20:22:51 +00:00
parent 4c48b26742
commit e686e1a17f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-03-09 Bruno Haible <haible@clisp.cons.org>
* intl/dcigettext.c (transmem_block_t): Change to unsigned char, to
avoid compiler warning.
(_nl_find_msg): Add casts to avoid compiler warnings.
2001-03-21 Ulrich Drepper <drepper@redhat.com> 2001-03-21 Ulrich Drepper <drepper@redhat.com>
* gmon/Makefile (routines): Add sprofil. * gmon/Makefile (routines): Add sprofil.

10
intl/dcigettext.c
View File

@ -339,7 +339,7 @@ typedef struct transmem_list
} transmem_block_t; } transmem_block_t;
static struct transmem_list *transmem_list; static struct transmem_list *transmem_list;
#else #else
typedef char transmem_block_t; typedef unsigned char transmem_block_t;
#endif #endif
@ -793,7 +793,7 @@ _nl_find_msg (domain_file, msgid, lengthp)
__libc_lock_lock (lock); __libc_lock_lock (lock);
inbuf = result; inbuf = (const unsigned char *) result;
outbuf = freemem + sizeof (size_t); outbuf = freemem + sizeof (size_t);
malloc_count = 0; malloc_count = 0;
@ -834,7 +834,9 @@ _nl_find_msg (domain_file, msgid, lengthp)
goto resize_freemem; goto resize_freemem;
outleft = freemem_size - sizeof (size_t); outleft = freemem_size - sizeof (size_t);
if (iconv (domain->conv, &inptr, &inleft, &outptr, &outleft) if (iconv (domain->conv,
(ICONV_CONST char **) &inptr, &inleft,
&outptr, &outleft)
!= (size_t) (-1)) != (size_t) (-1))
{ {
outbuf = (unsigned char *) outptr; outbuf = (unsigned char *) outptr;
@ -901,7 +903,7 @@ _nl_find_msg (domain_file, msgid, lengthp)
/* We have now in our buffer a converted string. Put this /* We have now in our buffer a converted string. Put this
into the table of conversions. */ into the table of conversions. */
*(size_t *) freemem = outbuf - freemem - sizeof (size_t); *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
domain->conv_tab[act] = freemem; domain->conv_tab[act] = (char *) freemem;
/* Shrink freemem, but keep it aligned. */ /* Shrink freemem, but keep it aligned. */
freemem_size -= outbuf - freemem; freemem_size -= outbuf - freemem;
freemem = outbuf; freemem = outbuf;