cvs: php-src(PHP_5_3) /ext/curl interface.c streams.c

kalle Tue May 19 18:08:58 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c streams.c Log: MFH: Fixed compiler warnings # (see previous commit message) http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.46&r2=1.62.2.14.2.27.2.47&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.46 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.47 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.46 Mon May 18 12:51:05 2009 +++ php-src/ext/curl/interface.c Tue May 19 18:08:57 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.46 2009/05/18 12:51:05 jani Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.47 2009/05/19 18:08:57 kalle Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -967,10 +967,10 @@ MAKE_STD_ZVAL(zultotal); MAKE_STD_ZVAL(zulnow); - ZVAL_LONG(zdltotal, dltotal); - ZVAL_LONG(zdlnow, dlnow); - ZVAL_LONG(zultotal, ultotal); - ZVAL_LONG(zulnow, ulnow); + ZVAL_LONG(zdltotal, (long) dltotal); + ZVAL_LONG(zdlnow, (long) dlnow); + ZVAL_LONG(zultotal, (long) ultotal); + ZVAL_LONG(zulnow, (long) ulnow); argv[0] = &zdltotal; argv[1] = &zdlnow; @@ -1071,7 +1071,7 @@ #endif } else if (retval_ptr) { if (Z_TYPE_P(retval_ptr) == IS_STRING) { - length = MIN(size * nmemb, Z_STRLEN_P(retval_ptr)); + length = MIN((int) (size * nmemb), Z_STRLEN_P(retval_ptr)); memcpy(data, Z_STRVAL_P(retval_ptr), length); } zval_ptr_dtor(&retval_ptr); http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.11.2.5&r2=1.14.2.2.2.11.2.6&diff_format=u Index: php-src/ext/curl/streams.c diff -u php-src/ext/curl/streams.c:1.14.2.2.2.11.2.5 php-src/ext/curl/streams.c:1.14.2.2.2.11.2.6 --- php-src/ext/curl/streams.c:1.14.2.2.2.11.2.5 Tue May 5 00:31:56 2009 +++ php-src/ext/curl/streams.c Tue May 19 18:08:57 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.14.2.2.2.11.2.5 2009/05/05 00:31:56 jani Exp $ */ +/* $Id: streams.c,v 1.14.2.2.2.11.2.6 2009/05/19 18:08:57 kalle Exp $ */ /* This file implements cURL based wrappers. * NOTE: If you are implementing your own streams that are intended to @@ -132,7 +132,7 @@ /* our notification system only works in a single direction; we should detect which * direction is important and use the correct values in this call */ - php_stream_notify_progress(stream->context, dlnow, dltotal); + php_stream_notify_progress(stream->context, (size_t) dlnow, (size_t) dltotal); return 0; }