diff options
| author | Arnaud Le Blanc <lbarnaud@php.net> | 2008-11-05 21:35:02 +0000 |
|---|---|---|
| committer | Arnaud Le Blanc <lbarnaud@php.net> | 2008-11-05 21:35:02 +0000 |
| commit | 2276e85f132ea17c1e49f6849eaf34ecde7a8882 (patch) | |
| tree | df26023b3c85fb1b43d5ad4051c994bf459dc220 /Zend/zend_ini_scanner.l | |
| parent | cab00baafa73ca3106f16f9671613ef5b2f5a22f (diff) | |
| download | php-git-2276e85f132ea17c1e49f6849eaf34ecde7a8882.tar.gz | |
MFH: Added parse_ini_string() function (grange at lemonde dot fr, Arnaud)
[DOC] new function parse_ini_string()
proto array parse_ini_string(string ini_string
[, bool process_sections [, int scanner_mode]])
Same as parse_ini_file() except that it takes a string instead of a
filename.
Diffstat (limited to 'Zend/zend_ini_scanner.l')
| -rw-r--r-- | Zend/zend_ini_scanner.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 22228837c9..4782383030 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -188,7 +188,7 @@ int zend_ini_scanner_get_lineno(TSRMLS_D) */ char *zend_ini_scanner_get_filename(TSRMLS_D) { - return ini_filename; + return ini_filename ? ini_filename : "Unknown"; } /* }}} */ @@ -481,7 +481,7 @@ DOUBLE_QUOTES_CHARS ([^$"\\]|("\\"[^"])|{LITERAL_DOLLAR}|"\\"["][^\r\n]) } <INITIAL>{TABS_AND_SPACES}*[#][^\r\n]*{NEWLINE} { /* #Comment */ - zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", ini_filename, SCNG(lineno)); + zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno)); BEGIN(INITIAL); SCNG(lineno)++; return END_OF_LINE; |