[PHP-CVS] cvs: php-src /ext/standard file.c

[Sara Golemon]

pollita         Tue Apr 18 19:10:12 2006 UTC

  Modified files:              
    /php-src/ext/standard       file.c 
  Log:
  Silence compiler warnings
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.436&r2=1.437&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.436 php-src/ext/standard/file.c:1.437
--- php-src/ext/standard/file.c:1.436   Fri Apr 14 17:44:56 2006
+++ php-src/ext/standard/file.c Tue Apr 18 19:10:12 2006
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: file.c,v 1.436 2006/04/14 17:44:56 pollita Exp $ */
+/* $Id: file.c,v 1.437 2006/04/18 19:10:12 pollita Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -504,7 +504,7 @@
        char *filename;
        int filename_len;
        zend_uchar filename_type;
-       char *contents;
+       void *contents;
        long flags = 0;
        zend_bool use_include_path = 0;
        php_stream *stream;
@@ -522,7 +522,7 @@
 
        context = php_stream_context_from_zval(zcontext, 0);
        if (filename_type == IS_UNICODE) {
-               if (php_stream_path_encode(NULL, &filename, &filename_len, 
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+               if (php_stream_path_encode(NULL, &filename, &filename_len, 
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
                        RETURN_FALSE;
                }
        }
@@ -599,7 +599,7 @@
        }
 
        if (filename_type == IS_UNICODE) {
-               if (php_stream_path_encode(NULL, &filename, &filename_len, 
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+               if (php_stream_path_encode(NULL, &filename, &filename_len, 
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
                        RETURN_FALSE;
                }
        }
@@ -907,7 +907,7 @@
        context = php_stream_context_from_zval(zcontext, 0);
 
        if (filename_type == IS_UNICODE) {
-               if (php_stream_path_encode(NULL, &filename, &filename_len, 
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+               if (php_stream_path_encode(NULL, &filename, &filename_len, 
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
                        RETURN_FALSE;
                }
        }
@@ -1438,7 +1438,7 @@
        }
 
        if (filename_type == IS_UNICODE) {
-               if (php_stream_path_encode(NULL, &filename, &filename_len, 
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+               if (php_stream_path_encode(NULL, &filename, &filename_len, 
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
                        RETURN_FALSE;
                }
        }
@@ -1561,7 +1561,7 @@
        context = php_stream_context_from_zval(zcontext, 0);
 
        if (filename_type == IS_UNICODE) {
-               if (php_stream_path_encode(NULL, &filename, &filename_len, 
filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
+               if (php_stream_path_encode(NULL, &filename, &filename_len, 
(UChar*)filename, filename_len, REPORT_ERRORS, context) == FAILURE) {
                        RETURN_FALSE;
                }
        }
@@ -2333,7 +2333,7 @@
        }
 
        if (filename_type == IS_UNICODE) {
-               if (php_stream_path_encode(&php_plain_files_wrapper, &filename, 
&filename_len, filename, filename_len, REPORT_ERRORS, FG(default_context)) == 
FAILURE) {
+               if (php_stream_path_encode(&php_plain_files_wrapper, &filename, 
&filename_len, (UChar*)filename, filename_len, REPORT_ERRORS, 
FG(default_context)) == FAILURE) {
                        RETURN_FALSE;
                }
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php