Fix [-Wformat-extra-args] build warnings

[m6w6/ext-http] / src / php_http_client.c

diff --git a/src/php_http_client.c b/src/php_http_client.c
index b7cf2b90ea62aec15c468d65fa82ca8dab3094fa..317b494c306b7a7ada901d1ac8a11daaa2565dc1 100644 (file)
--- a/src/php_http_client.c
+++ b/src/php_http_client.c
@@ -583,7 +583,7 @@ static PHP_METHOD(HttpClient, __construct)
                php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|S!S!", &driver_name, &persistent_handle_name), invalid_arg, return);
 
                if (!zend_hash_num_elements(&php_http_client_drivers)) {
-                       php_http_throw(unexpected_val, "No http\\Client drivers available", NULL);
+                       php_http_throw(unexpected_val, "No http\\Client drivers available");
                        return;
                }
                if (!(driver = php_http_client_driver_get(driver_name))) {
@@ -689,7 +689,7 @@ static PHP_METHOD(HttpClient, enqueue)
        zend_fcall_info_cache fcc = empty_fcall_info_cache;
        php_http_client_object_t *obj;
        php_http_message_object_t *msg_obj;
-       php_http_client_enqueue_t q;
+       php_http_client_enqueue_t q = {0};
 
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|f", &request, php_http_get_client_request_class_entry(), &fci, &fcc), invalid_arg, return);
 
@@ -697,10 +697,21 @@ static PHP_METHOD(HttpClient, enqueue)
        msg_obj = PHP_HTTP_OBJ(NULL, request);
 
        if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
-               php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue", NULL);
+               php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue");
                return;
        }
 
+       /* set early for progress callback */
+       q.opaque = msg_obj;
+
+       if (obj->client->callback.progress.func) {
+               php_http_client_progress_state_t progress = {0};
+
+               progress.info = "prepare";
+               obj->client->callback.progress.func(obj->client->callback.progress.arg, obj->client, &q, &progress);
+       }
+
+       Z_ADDREF_P(request);
        q.request = msg_obj->message;
        q.options = combined_options(getThis(), request);
        q.dtor = msg_queue_dtor;
@@ -715,8 +726,6 @@ static PHP_METHOD(HttpClient, enqueue)
                }
        }
 
-       Z_ADDREF_P(request);
-
        php_http_expect(SUCCESS == php_http_client_enqueue(obj->client, &q), runtime,
                        msg_queue_dtor(&q);
                        return;
@@ -740,7 +749,7 @@ static PHP_METHOD(HttpClient, dequeue)
        msg_obj = PHP_HTTP_OBJ(NULL, request);
 
        if (!php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
-               php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue", NULL);
+               php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue");
                return;
        }
 
@@ -834,7 +843,7 @@ static PHP_METHOD(HttpClient, getResponse)
                }
 
                /* not found for the request! */
-               php_http_throw(unexpected_val, "Could not find response for the request", NULL);
+               php_http_throw(unexpected_val, "Could not find response for the request");
                return;
        }
 
@@ -990,7 +999,7 @@ static PHP_METHOD(HttpClient, notify)
        observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
        if (Z_TYPE_P(observers) != IS_OBJECT) {
-               php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+               php_http_throw(unexpected_val, "Observer storage is corrupted");
                return;
        }
 
@@ -1036,7 +1045,7 @@ static PHP_METHOD(HttpClient, attach)
        observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
        if (Z_TYPE_P(observers) != IS_OBJECT) {
-               php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+               php_http_throw(unexpected_val, "Observer storage is corrupted");
                return;
        }
 
@@ -1063,7 +1072,7 @@ static PHP_METHOD(HttpClient, detach)
        observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
        if (Z_TYPE_P(observers) != IS_OBJECT) {
-               php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+               php_http_throw(unexpected_val, "Observer storage is corrupted");
                return;
        }
 
@@ -1085,7 +1094,7 @@ static PHP_METHOD(HttpClient, getObservers)
        observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
        if (Z_TYPE_P(observers) != IS_OBJECT) {
-               php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+               php_http_throw(unexpected_val, "Observer storage is corrupted");
                return;
        }
 
@@ -1305,7 +1314,7 @@ static PHP_METHOD(HttpClient, setDebug)
 }
 
 static zend_function_entry php_http_client_methods[] = {
-       PHP_ME(HttpClient, __construct,          ai_HttpClient_construct,            ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(HttpClient, __construct,          ai_HttpClient_construct,            ZEND_ACC_PUBLIC)
        PHP_ME(HttpClient, reset,                ai_HttpClient_reset,                ZEND_ACC_PUBLIC)
        PHP_ME(HttpClient, enqueue,              ai_HttpClient_enqueue,              ZEND_ACC_PUBLIC)
        PHP_ME(HttpClient, dequeue,              ai_HttpClient_dequeue,              ZEND_ACC_PUBLIC)