From 762557e921e7bc01c12facd346fabd6863c92d24 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sun, 6 Apr 2025 21:00:51 +0100 Subject: [PATCH] Fix few build warnings. mostly litespeed SAPI. --- ext/standard/exec.c | 2 +- ext/standard/mail.c | 2 +- sapi/litespeed/lsapi_main.c | 8 ++++---- sapi/litespeed/lscriu.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 1df46cc050b01..ce3e8565ad200 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -118,7 +118,7 @@ PHPAPI int php_exec(int type, const char *cmd, zval *array, zval *return_value) php_stream *stream; size_t buflen, bufl = 0; #if PHP_SIGCHILD - void (*sig_handler)() = signal(SIGCHLD, SIG_DFL); + void (*sig_handler)(int) = signal(SIGCHLD, SIG_DFL); #endif #ifdef PHP_WIN32 diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 35c23a0be76c0..0243ec897a05e 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -445,7 +445,7 @@ PHPAPI bool php_mail(const char *to, const char *subject, const char *message, c const char *hdr = headers; char *ahdr = NULL; #if PHP_SIGCHILD - void (*sig_handler)() = NULL; + void (*sig_handler)(int) = NULL; #endif #define MAIL_RET(val) \ diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 259d4a985cc66..a135e031b24d0 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -1678,11 +1678,11 @@ PHP_FUNCTION(litespeed_response_headers) char headerBuf[SAPI_LSAPI_MAX_HEADER_LENGTH]; if (zend_parse_parameters_none() == FAILURE) { - RETURN_THROWS(); - } + RETURN_THROWS(); + } - if (!&SG(sapi_headers).headers) { - RETURN_FALSE; + if (!zend_llist_count(&SG(sapi_headers).headers)) { + RETURN_FALSE; } array_init(return_value); diff --git a/sapi/litespeed/lscriu.c b/sapi/litespeed/lscriu.c index 1eb468fdf28cc..409fe989b5551 100644 --- a/sapi/litespeed/lscriu.c +++ b/sapi/litespeed/lscriu.c @@ -658,7 +658,7 @@ static int LSCRIU_Init_Env_Parameters(void) } -void LSCRIU_inc_req_processed() +void LSCRIU_inc_req_processed(void) { if (!LSCRIU_Get_Global_Counter_Type()) { ++s_requests_count;