svn commit: branches/uClibc-nptl: libc/misc/wchar utils

[carmelo at uclibc.org]

Author: carmelo
Date: 2009-01-29 13:23:09 +0000 (Thu, 29 Jan 2009)
New Revision: 25121

Log:
Minor changes to silent compiler warning due to sigdness.

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>



Modified:
   branches/uClibc-nptl/libc/misc/wchar/wchar.c
   branches/uClibc-nptl/utils/ldconfig.c


Changeset:
Modified: branches/uClibc-nptl/libc/misc/wchar/wchar.c
===================================================================
--- branches/uClibc-nptl/libc/misc/wchar/wchar.c	2009-01-29 13:21:57 UTC (rev 25120)
+++ branches/uClibc-nptl/libc/misc/wchar/wchar.c	2009-01-29 13:23:09 UTC (rev 25121)
@@ -1660,7 +1660,7 @@
 
 	if (opts[5]) {				/* -l */
 		fprintf(stderr, "Recognized codesets:\n");
-		for (s = __iconv_codesets ; *s ; s += *s) {
+		for (s = (char *)__iconv_codesets ; *s ; s += *s) {
 			fprintf(stderr,"  %s\n", s+2);
 		}
 		s = __LOCALE_DATA_CODESET_LIST;

Modified: branches/uClibc-nptl/utils/ldconfig.c
===================================================================
--- branches/uClibc-nptl/utils/ldconfig.c	2009-01-29 13:21:57 UTC (rev 25120)
+++ branches/uClibc-nptl/utils/ldconfig.c	2009-01-29 13:23:09 UTC (rev 25121)
@@ -278,12 +278,12 @@
 				if (fread(&exec, sizeof exec, 1, file) < 1)
 					warnx("can't read header from %s, skipping", buff);
 				else if (N_MAGIC(exec) != ZMAGIC
-					 && N_MAGIC(exec) != QMAGIC
-					 && N_MAGIC_SWAP(exec) != ZMAGIC
-					 && N_MAGIC_SWAP(exec) != QMAGIC) {
+				 && N_MAGIC(exec) != QMAGIC
+				 && N_MAGIC_SWAP(exec) != ZMAGIC
+				 && N_MAGIC_SWAP(exec) != QMAGIC) {
 					elf_hdr = (ElfW(Ehdr) *) & exec;
 					if (elf_hdr->e_ident[0] != 0x7f ||
-					    strncmp(elf_hdr->e_ident+1, "ELF", 3) != 0)
+					    strncmp((char *)elf_hdr->e_ident + 1, "ELF", 3) != 0)
 					{
 						/* silently ignore linker scripts */
 						if (strncmp((char *)&exec, "/* GNU ld", 9) != 0)