Explorar el Código

fix some pointer signedness issues (this was invalid C)

Rich Felker hace 14 años
padre
commit
a8c17e6587
Se han modificado 2 ficheros con 3 adiciones y 3 borrados
  1. 2 2
      src/stdio/fgetwc.c
  2. 1 1
      src/stdio/fputws.c

+ 2 - 2
src/stdio/fgetwc.c

@@ -12,7 +12,7 @@ wint_t __fgetwc_unlocked(FILE *f)
 
 	/* Convert character from buffer if possible */
 	if (f->rpos < f->rend) {
-		l = mbrtowc(&wc, f->rpos, f->rend - f->rpos, &st);
+		l = mbrtowc(&wc, (void *)f->rpos, f->rend - f->rpos, &st);
 		if (l+2 >= 2) {
 			f->rpos += l + !l; /* l==0 means 1 byte, null */
 			return wc;
@@ -30,7 +30,7 @@ wint_t __fgetwc_unlocked(FILE *f)
 			if (!mbsinit(&st)) errno = EILSEQ;
 			return WEOF;
 		}
-		l = mbrtowc(&wc, &b, 1, &st);
+		l = mbrtowc(&wc, (void *)&b, 1, &st);
 		if (l == -1) return WEOF;
 	}
 

+ 1 - 1
src/stdio/fputws.c

@@ -9,7 +9,7 @@ int fputws(const wchar_t *ws, FILE *f)
 
 	f->mode |= f->mode+1;
 
-	while (ws && (l = wcsrtombs(buf, (void*)&ws, sizeof buf, 0))+1 > 1)
+	while (ws && (l = wcsrtombs((void *)buf, (void*)&ws, sizeof buf, 0))+1 > 1)
 		if (__fwritex(buf, l, f) < l) {
 			FUNLOCK(f);
 			return -1;