diff options
| author | foobar <sniper@php.net> | 2001-03-02 00:15:49 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-03-02 00:15:49 +0000 |
| commit | d3ce7f294c236c6a62f0e3697f45c96afde35ddc (patch) | |
| tree | 9bb3b9daf9695cb8f3647f84348a39a8f290a757 /ext/standard/html.c | |
| parent | fa0085b495f9f8b23b486a375ab38fc33af69fa5 (diff) | |
| download | php-git-d3ce7f294c236c6a62f0e3697f45c96afde35ddc.tar.gz | |
ws fix
Diffstat (limited to 'ext/standard/html.c')
| -rw-r--r-- | ext/standard/html.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/ext/standard/html.c b/ext/standard/html.c index e3253c46d0..82fa8c46f7 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -45,9 +45,9 @@ static char EntTable[][7] = "uuml","yacute","thorn","yuml" }; -#define ENT_COMPAT 1 -#define ENT_QUOTES 2 -#define ENT_NOQUOTES 4 +#define ENT_COMPAT 1 +#define ENT_QUOTES 2 +#define ENT_NOQUOTES 4 PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style) { @@ -89,7 +89,7 @@ PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newle } old++; } - new [len] = '\0'; + new [len] = '\0'; *newlen = len; return new; @@ -97,23 +97,23 @@ PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newle static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all) { - zval **arg, **quotes; - int len, quote_style = ENT_COMPAT; + zval **arg, **quotes; + int len, quote_style = ENT_COMPAT; int ac = ZEND_NUM_ARGS(); char *new; if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &arg, "es) == FAILURE) { - WRONG_PARAM_COUNT; - } + WRONG_PARAM_COUNT; + } - convert_to_string_ex(arg); + convert_to_string_ex(arg); if(ac==2) { convert_to_long_ex(quotes); quote_style = (*quotes)->value.lval; } new = php_escape_html_entities((*arg)->value.str.val, (*arg)->value.str.len, &len, all, quote_style); - RETVAL_STRINGL(new,len,0); + RETVAL_STRINGL(new,len,0); } #define HTML_SPECIALCHARS 0 @@ -155,8 +155,8 @@ PHP_FUNCTION(get_html_translation_table) char ind[ 2 ]; if (ac < 0 || ac > 2 || zend_get_parameters_ex(ac, &whichone, "es) == FAILURE) { - WRONG_PARAM_COUNT; - } + WRONG_PARAM_COUNT; + } if (ac > 0) { convert_to_long_ex(whichone); @@ -184,9 +184,11 @@ PHP_FUNCTION(get_html_translation_table) case HTML_SPECIALCHARS: ind[0]=38; add_assoc_string(return_value,ind,"&",1); if(quote_style&ENT_QUOTES) { - ind[0]=39; add_assoc_string(return_value,ind,"'",1); } + ind[0]=39; add_assoc_string(return_value,ind,"'",1); + } if(!(quote_style&ENT_NOQUOTES)) { - ind[0]=34; add_assoc_string(return_value,ind,""",1); } + ind[0]=34; add_assoc_string(return_value,ind,""",1); + } ind[0]=60; add_assoc_string(return_value,ind,"<",1); ind[0]=62; add_assoc_string(return_value,ind,">",1); break; |