kalle Tue May 19 18:08:13 2009 UTC
Modified files:
/php-src/ext/curl interface.c streams.c
Log:
Fixed compiler warnings
# Is it intended that curl_progress should cast to long rather than keeping
the
# double? Or doesn't it matter?
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.163&r2=1.164&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.163 php-src/ext/curl/interface.c:1.164
--- php-src/ext/curl/interface.c:1.163 Mon May 18 12:50:44 2009
+++ php-src/ext/curl/interface.c Tue May 19 18:08:13 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.163 2009/05/18 12:50:44 jani Exp $ */
+/* $Id: interface.c,v 1.164 2009/05/19 18:08:13 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.33&r2=1.34&diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.33 php-src/ext/curl/streams.c:1.34
--- php-src/ext/curl/streams.c:1.33 Tue May 5 00:30:40 2009
+++ php-src/ext/curl/streams.c Tue May 19 18:08:13 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.33 2009/05/05 00:30:40 jani Exp $ */
+/* $Id: streams.c,v 1.34 2009/05/19 18:08:13 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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
