diff options
| author | Jani Taskinen <jani@php.net> | 2010-03-11 10:24:29 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2010-03-11 10:24:29 +0000 |
| commit | 06f072cb5e4e3582e20b8762141eccbc4dce85fa (patch) | |
| tree | 511382440db96edad3a2627ce361113e29d672ab /Zend/zend_indent.c | |
| parent | f60946eb5430cd11daa9f88503dc9b1a9b7bd634 (diff) | |
| download | php-git-06f072cb5e4e3582e20b8762141eccbc4dce85fa.tar.gz | |
MFH: Improved / fixed output buffering (Michael Wallner)
Diffstat (limited to 'Zend/zend_indent.c')
| -rw-r--r-- | Zend/zend_indent.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c index 8c44c50cd0..edcd252a85 100644 --- a/Zend/zend_indent.c +++ b/Zend/zend_indent.c @@ -30,11 +30,10 @@ #define zendtext LANG_SCNG(yy_text) #define zendleng LANG_SCNG(yy_leng) - -static void handle_whitespace(int *emit_whitespace) +static void handle_whitespace(unsigned int *emit_whitespace) /* {{{ */ { unsigned char c; - int i; + unsigned int i; for (c=0; c<128; c++) { if (emit_whitespace[c]>0) { @@ -45,29 +44,29 @@ static void handle_whitespace(int *emit_whitespace) } memset(emit_whitespace, 0, sizeof(int)*256); } +/* }}} */ - -ZEND_API void zend_indent() +ZEND_API void zend_indent(void) /* {{{ */ { zval token; int token_type; int in_string=0; - int nest_level=0; - int emit_whitespace[256]; - int i; + unsigned int nest_level=0; + unsigned int emit_whitespace[256]; + unsigned int i; TSRMLS_FETCH(); memset(emit_whitespace, 0, sizeof(int)*256); /* highlight stuff coming back from zendlex() */ - token.type = 0; + Z_TYPE(token) = 0; while ((token_type=lex_scan(&token TSRMLS_CC))) { switch (token_type) { case T_INLINE_HTML: zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); break; case T_WHITESPACE: { - token.type = 0; + Z_TYPE(token) = 0; /* eat whitespace, emit newlines */ for (i=0; i<LANG_SCNG(yy_leng); i++) { emit_whitespace[(unsigned char) LANG_SCNG(yy_text)[i]]++; @@ -79,7 +78,7 @@ ZEND_API void zend_indent() in_string = !in_string; /* break missing intentionally */ default: - if (token.type==0) { + if (Z_TYPE(token)==0) { /* keyword */ switch (token_type) { case ',': @@ -132,20 +131,21 @@ dflt_printout: } break; } - if (token.type == IS_STRING) { + if (Z_TYPE(token) == IS_STRING) { switch (token_type) { case T_OPEN_TAG: case T_CLOSE_TAG: case T_WHITESPACE: break; default: - efree(token.value.str.val); + efree(Z_STRVAL(token)); break; } } - token.type = 0; + Z_TYPE(token) = 0; } } +/* }}} */ /* * Local variables: |