tony2001 Tue Oct 3 23:22:21 2006 UTC
Modified files:
/php-src/main php_streams.h
/php-src/main/streams streams.c
Log:
int -> size_t
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.116&r2=1.117&diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.116 php-src/main/php_streams.h:1.117
--- php-src/main/php_streams.h:1.116 Mon Oct 2 02:24:29 2006
+++ php-src/main/php_streams.h Tue Oct 3 23:22:21 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_streams.h,v 1.116 2006/10/02 02:24:29 pollita Exp $ */
+/* $Id: php_streams.h,v 1.117 2006/10/03 23:22:21 tony2001 Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -511,7 +511,7 @@
#define PHP_STREAM_COPY_ALL ((size_t)-1)
BEGIN_EXTERN_C()
-PHPAPI size_t _php_stream_ucopy_to_stream(php_stream *src, php_stream *dest,
size_t maxlen, int maxchars STREAMS_DC TSRMLS_DC);
+PHPAPI size_t _php_stream_ucopy_to_stream(php_stream *src, php_stream *dest,
size_t maxlen, size_t maxchars STREAMS_DC TSRMLS_DC);
PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest,
size_t maxlen STREAMS_DC TSRMLS_DC);
/* Preserve "characters" semantics by having maxlen refer to maxchars in a
unicode context */
#define php_stream_copy_to_stream(src, dest, maxlen) ( ((src)->readbuf_type
== IS_STRING) \
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.138&r2=1.139&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.138
php-src/main/streams/streams.c:1.139
--- php-src/main/streams/streams.c:1.138 Tue Oct 3 19:52:34 2006
+++ php-src/main/streams/streams.c Tue Oct 3 23:22:21 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.138 2006/10/03 19:52:34 iliaa Exp $ */
+/* $Id: streams.c,v 1.139 2006/10/03 23:22:21 tony2001 Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1734,7 +1734,7 @@
}
/* Designed for copying UChars (taking into account both maxlen and maxchars)
*/
-PHPAPI size_t _php_stream_ucopy_to_stream(php_stream *src, php_stream *dest,
size_t maxlen, int maxchars STREAMS_DC TSRMLS_DC)
+PHPAPI size_t _php_stream_ucopy_to_stream(php_stream *src, php_stream *dest,
size_t maxlen, size_t maxchars STREAMS_DC TSRMLS_DC)
{
size_t haveread = 0;
php_stream_statbuf ssbuf;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
