Skip to content

Commit 5e9b335

Browse files
MaxKellermannGirgias
authored andcommitted
Zend/zend_ini_scanner: zend_ini_scanner_get_filename() returns const string
1 parent e7a0a2b commit 5e9b335

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

Zend/zend_ini_parser.y

+1-2
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,8 @@ static ZEND_COLD void ini_error(const char *msg)
187187
{
188188
char *error_buf;
189189
int error_buf_len;
190-
char *currently_parsed_filename;
191190

192-
currently_parsed_filename = zend_ini_scanner_get_filename();
191+
const char *const currently_parsed_filename = zend_ini_scanner_get_filename();
193192
if (currently_parsed_filename) {
194193
error_buf_len = 128 + (int)strlen(msg) + (int)strlen(currently_parsed_filename); /* should be more than enough */
195194
error_buf = (char *) emalloc(error_buf_len);

Zend/zend_ini_scanner.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
BEGIN_EXTERN_C()
2929
ZEND_COLD int zend_ini_scanner_get_lineno(void);
30-
ZEND_COLD char *zend_ini_scanner_get_filename(void);
30+
ZEND_COLD const char *zend_ini_scanner_get_filename(void);
3131
zend_result zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode);
3232
zend_result zend_ini_prepare_string_for_scanning(char *str, int scanner_mode);
3333
int ini_lex(zval *ini_lval);

Zend/zend_ini_scanner.l

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ ZEND_COLD int zend_ini_scanner_get_lineno(void)
261261
/* }}} */
262262

263263
/* {{{ zend_ini_scanner_get_filename() */
264-
ZEND_COLD char *zend_ini_scanner_get_filename(void)
264+
ZEND_COLD const char *zend_ini_scanner_get_filename(void)
265265
{
266266
return ini_filename ? ZSTR_VAL(ini_filename) : "Unknown";
267267
}

0 commit comments

Comments
 (0)