]> granicus.if.org Git - php/commitdiff
MFH: Fixed compiler warnings
authorKalle Sommer Nielsen <kalle@php.net>
Tue, 19 May 2009 18:08:57 +0000 (18:08 +0000)
committerKalle Sommer Nielsen <kalle@php.net>
Tue, 19 May 2009 18:08:57 +0000 (18:08 +0000)
# (see previous commit message)

ext/curl/interface.c
ext/curl/streams.c

index 81e9960b1a3e6246da5587c61dee9b631ac47cd3..18d6c471c0c1870d1bb5edffae3c956acb35201a 100644 (file)
@@ -967,10 +967,10 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
                        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 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
 #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);
index d7f0efe221db776a5f52df6783305180516be673..8509e4a14761b61ba2dbfa18f1dd737cc0eb7582 100644 (file)
@@ -132,7 +132,7 @@ static int on_progress_avail(php_stream *stream, double dltotal, double dlnow, d
 
        /* 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;
 }