From: Antony Dovgal <tony2001@php.net>
Date: Fri, 12 Aug 2005 19:27:45 +0000 (+0000)
Subject: fix fgetc() & compile warnings
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=363d0aa028f82d26d3f53364f8208d62c87f144d;p=php

fix fgetc() & compile warnings
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 009c9e6bd5..89f95c870a 100644
--- a/ext/standard/file.c
+++ b/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)) {