Commit 3d84b8fe0ef for php
commit 3d84b8fe0efe4c6376b91b43490096c1a813c335
Author: Gina Peter Banyard <girgias@php.net>
Date: Thu Sep 24 17:19:08 2026 +0100
Zend: voidify init_ini_scanner()
It now always returns SUCCESS, and propagate the voidification chain for call sites of init_ini_scanner that now always return SUCCESS.
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 7c91e4a8e0f..52031010da4 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -255,9 +255,7 @@ ZEND_API zend_result zend_parse_ini_string(const char *str, bool unbuffered_erro
ini_parser_param.arg = arg;
CG(ini_parser_param) = &ini_parser_param;
- if (zend_ini_prepare_string_for_scanning(str, scanner_mode) == FAILURE) {
- return FAILURE;
- }
+ zend_ini_prepare_string_for_scanning(str, scanner_mode);
CG(ini_parser_unbuffered_errors) = unbuffered_errors;
retval = ini_parse();
diff --git a/Zend/zend_ini_scanner.h b/Zend/zend_ini_scanner.h
index 4a6b5d08900..9135d9c139d 100644
--- a/Zend/zend_ini_scanner.h
+++ b/Zend/zend_ini_scanner.h
@@ -34,7 +34,7 @@ BEGIN_EXTERN_C()
ZEND_COLD uint32_t zend_ini_scanner_get_lineno(void);
ZEND_COLD const char *zend_ini_scanner_get_filename(void);
zend_result zend_ini_open_file_for_scanning(zend_file_handle *fh, zend_ini_scanner_mode scanner_mode);
-zend_result zend_ini_prepare_string_for_scanning(const char *str, zend_ini_scanner_mode scanner_mode);
+void zend_ini_prepare_string_for_scanning(const char *str, zend_ini_scanner_mode scanner_mode);
int ini_lex(zval *ini_lval);
void shutdown_ini_scanner(void);
END_EXTERN_C()
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index acf265604cc..e837ce85c1d 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -192,7 +192,7 @@ static void yy_scan_buffer(const char *str, unsigned int len)
#define ini_filename SCNG(filename)
-static zend_result init_ini_scanner(zend_ini_scanner_mode scanner_mode, zend_file_handle *fh)
+static void init_ini_scanner(zend_ini_scanner_mode scanner_mode, zend_file_handle *fh)
{
SCNG(lineno) = 1;
SCNG(scanner_mode) = scanner_mode;
@@ -206,8 +206,6 @@ static zend_result init_ini_scanner(zend_ini_scanner_mode scanner_mode, zend_fil
zend_stack_init(&SCNG(state_stack), sizeof(int));
BEGIN(INITIAL);
-
- return SUCCESS;
}
/* {{{ shutdown_ini_scanner() */
@@ -234,7 +232,6 @@ ZEND_COLD const char *zend_ini_scanner_get_filename(void)
}
/* }}} */
-/* {{{ zend_ini_open_file_for_scanning() */
zend_result zend_ini_open_file_for_scanning(zend_file_handle *fh, zend_ini_scanner_mode scanner_mode)
{
char *buf;
@@ -244,27 +241,20 @@ zend_result zend_ini_open_file_for_scanning(zend_file_handle *fh, zend_ini_scann
return FAILURE;
}
- if (init_ini_scanner(scanner_mode, fh) == FAILURE) {
- return FAILURE;
- }
+ init_ini_scanner(scanner_mode, fh);
yy_scan_buffer(buf, (unsigned int)size);
return SUCCESS;
}
-/* }}} */
-zend_result zend_ini_prepare_string_for_scanning(const char *str, zend_ini_scanner_mode scanner_mode)
+void zend_ini_prepare_string_for_scanning(const char *str, zend_ini_scanner_mode scanner_mode)
{
int len = (int)strlen(str);
- if (init_ini_scanner(scanner_mode, NULL) == FAILURE) {
- return FAILURE;
- }
+ init_ini_scanner(scanner_mode, NULL);
yy_scan_buffer(str, len);
-
- return SUCCESS;
}
/* {{{ zend_ini_escape_string() */