diff options
| author | Wez Furlong <wez@php.net> | 2003-02-18 09:37:54 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-02-18 09:37:54 +0000 |
| commit | e52aac940f0c657b4f5d1cddaf7c14f81c1d4b67 (patch) | |
| tree | 8ad30d117e33db2149d5a285fa359f3df57af1d2 /Zend/zend_ini_scanner.l | |
| parent | 500dfcfd62d04937ce73e46c0fb9b5e82da84105 (diff) | |
| download | php-git-e52aac940f0c657b4f5d1cddaf7c14f81c1d4b67.tar.gz | |
Implement simple stream support in the ZE scanners.
Diffstat (limited to 'Zend/zend_ini_scanner.l')
| -rw-r--r-- | Zend/zend_ini_scanner.l | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 45aae83154..33d1d294dd 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -71,22 +71,12 @@ char *zend_ini_scanner_get_filename(TSRMLS_D) int zend_ini_open_file_for_scanning(zend_file_handle *fh TSRMLS_DC) { - FILE *fp; - - switch (fh->type) { - case ZEND_HANDLE_FP: - fp = fh->handle.fp; - break; - case ZEND_HANDLE_FILENAME: - fp = zend_fopen(fh->filename, NULL); - fh->type = ZEND_HANDLE_FP; - break; - default: - return FAILURE; + if (FAILURE == zend_stream_fixup(fh TSRMLS_CC)) { + return FAILURE; } init_ini_scanner(TSRMLS_C); - yyin = fp; + yyin = fh; yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE TSRMLS_CC) TSRMLS_CC); ini_filename = fh->filename; return SUCCESS; @@ -95,11 +85,7 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh TSRMLS_DC) void zend_ini_close_file(zend_file_handle *fh TSRMLS_DC) { - switch (fh->type) { - case ZEND_HANDLE_FP: - fclose(fh->handle.fp); - break; - } + zend_stream_close(fh); } %} |