svn: /php/php-src/ branches/PHP_5_4/ext/standard/html.c trunk/ext/standard/html.c

cataphract Tue, 09 Aug 2011 00:40:45 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=314580 Log: - Elided unused argument in internal linkage function. Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/html.c U php/php-src/trunk/ext/standard/html.c Modified: php/php-src/branches/PHP_5_4/ext/standard/html.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/html.c 2011-08-08 22:30:24 UTC (rev 314579) +++ php/php-src/branches/PHP_5_4/ext/standard/html.c 2011-08-09 00:40:45 UTC (rev 314580) @@ -1520,7 +1520,6 @@ static inline void write_s3row_data( const entity_stage3_row *r, unsigned orig_cp, - unsigned uni_cp, enum entity_charset charset, zval *arr) { @@ -1636,7 +1635,7 @@ if (((code == '\'' && !(flags & ENT_HTML_QUOTE_SINGLE)) || (code == '"' && !(flags & ENT_HTML_QUOTE_DOUBLE)))) continue; - write_s3row_data(r, code, code, charset, return_value); + write_s3row_data(r, code, charset, return_value); } } } @@ -1658,7 +1657,7 @@ if (r->data.ent.entity == NULL) continue; - write_s3row_data(r, i, uni_cp, charset, return_value); + write_s3row_data(r, i, charset, return_value); } } } else { @@ -1677,7 +1676,7 @@ continue; /* charset is indifferent, used cs_8859_1 for efficiency */ - write_s3row_data(r, j, j, cs_8859_1, return_value); + write_s3row_data(r, j, cs_8859_1, return_value); } } } Modified: php/php-src/trunk/ext/standard/html.c =================================================================== --- php/php-src/trunk/ext/standard/html.c 2011-08-08 22:30:24 UTC (rev 314579) +++ php/php-src/trunk/ext/standard/html.c 2011-08-09 00:40:45 UTC (rev 314580) @@ -1520,7 +1520,6 @@ static inline void write_s3row_data( const entity_stage3_row *r, unsigned orig_cp, - unsigned uni_cp, enum entity_charset charset, zval *arr) { @@ -1636,7 +1635,7 @@ if (((code == '\'' && !(flags & ENT_HTML_QUOTE_SINGLE)) || (code == '"' && !(flags & ENT_HTML_QUOTE_DOUBLE)))) continue; - write_s3row_data(r, code, code, charset, return_value); + write_s3row_data(r, code, charset, return_value); } } } @@ -1658,7 +1657,7 @@ if (r->data.ent.entity == NULL) continue; - write_s3row_data(r, i, uni_cp, charset, return_value); + write_s3row_data(r, i, charset, return_value); } } } else { @@ -1677,7 +1676,7 @@ continue; /* charset is indifferent, used cs_8859_1 for efficiency */ - write_s3row_data(r, j, j, cs_8859_1, return_value); + write_s3row_data(r, j, cs_8859_1, return_value); } } }