Commit 8b1668d8424 for php.net
commit 8b1668d84245dbdecb3c094ec86c9305c84e2a57
Author: Gina Peter Banyard <girgias@php.net>
Date: Sun Jul 6 17:41:19 2025 +0100
ext/soap: Use bool type instead of int type for functions_all field
diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
index f35f357ae39..8d127ef1e5d 100644
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -75,7 +75,7 @@ struct _soapService {
struct _soap_functions {
HashTable *ft;
- int functions_all;
+ bool functions_all;
} soap_functions;
struct _soap_class {
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index d89ef349799..752e1c6361e 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1098,7 +1098,7 @@ PHP_METHOD(SoapServer, __construct)
service->version = version;
service->type = SOAP_FUNCTIONS;
- service->soap_functions.functions_all = FALSE;
+ service->soap_functions.functions_all = false;
service->soap_functions.ft = zend_new_array(0);
SOAP_SERVER_BEGIN_CODE();
@@ -1236,7 +1236,7 @@ PHP_METHOD(SoapServer, getFunctions)
ft = &(Z_OBJCE(service->soap_object)->function_table);
} else if (service->type == SOAP_CLASS) {
ft = &service->soap_class.ce->function_table;
- } else if (service->soap_functions.functions_all == TRUE) {
+ } else if (service->soap_functions.functions_all) {
ft = EG(function_table);
} else if (service->soap_functions.ft != NULL) {
zval *name;
@@ -1277,7 +1277,7 @@ PHP_METHOD(SoapServer, addFunction)
zval *tmp_function;
if (service->soap_functions.ft == NULL) {
- service->soap_functions.functions_all = FALSE;
+ service->soap_functions.functions_all = false;
service->soap_functions.ft = zend_new_array(zend_hash_num_elements(Z_ARRVAL_P(function_name)));
}
@@ -1316,7 +1316,7 @@ PHP_METHOD(SoapServer, addFunction)
RETURN_THROWS();
}
if (service->soap_functions.ft == NULL) {
- service->soap_functions.functions_all = FALSE;
+ service->soap_functions.functions_all = false;
service->soap_functions.ft = zend_new_array(0);
}
@@ -1335,7 +1335,7 @@ PHP_METHOD(SoapServer, addFunction)
efree(service->soap_functions.ft);
service->soap_functions.ft = NULL;
}
- service->soap_functions.functions_all = TRUE;
+ service->soap_functions.functions_all = true;
} else {
zend_argument_value_error(1, "must be SOAP_FUNCTIONS_ALL when an integer is passed");
}
@@ -1620,7 +1620,7 @@ PHP_METHOD(SoapServer, handle)
}
function_table = &((Z_OBJCE_P(soap_obj))->function_table);
} else {
- if (service->soap_functions.functions_all == TRUE) {
+ if (service->soap_functions.functions_all) {
function_table = EG(function_table);
} else {
function_table = service->soap_functions.ft;