Browse Source

fix fgetc() & compile warnings

migration/RELEASE_1_0_0
Antony Dovgal 21 years ago
parent
commit
363d0aa028
  1. 8
      ext/standard/file.c

8
ext/standard/file.c

@ -1109,13 +1109,13 @@ PHPAPI PHP_FUNCTION(fgetc)
RETVAL_FALSE;
} else {
if (is_unicode) {
UChar *ubuf = buf;
UChar *ubuf = (UChar *)buf;
int32_t num_u16 = num_bytes >> 1;
ubuf[num_u16] = 0;
RETURN_UNICODEL(ubuf, num_u16, 0);
RETURN_UNICODEL(ubuf, num_u16, 1);
} else {
buf[1] = 0;
RETURN_STRINGL(buf, 1, 0);
RETURN_STRINGL(buf, 1, 1);
}
}
}
@ -1868,7 +1868,7 @@ PHPAPI PHP_FUNCTION(fread)
buf[num_bytes] = 0;
buf[num_bytes + 1] = 0;
RETURN_UNICODEL(buf, num_bytes >> 1, 0);
RETURN_UNICODEL((UChar *)buf, num_bytes >> 1, 0);
} else {
buf[num_bytes] = 0;
if (PG(magic_quotes_runtime)) {

Loading…
Cancel
Save