archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Less GCC warnings; code less readable, yay!

Browse source 
- Fixed html_tables.h generaration in 64-bit archs.
- Closes bug #55394 - Patch to suppress initialization warnings in html.c
#signed/unsigned mismatches for another day
#regenerated tables on another commit
This commit is contained in:
Gustavo André dos Santos Lopes 2011-08-31 05:45:02 +00:00
parent 2459296ff5
commit 1a9d43a807
2 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/standard/html.c
View file

@ -271,7 +271,7 @@ static inline unsigned int get_next_char(
MB_FAILURE(pos, 2); MB_FAILURE(pos, 2);
} }
pos += 2; pos += 2;
} else if (c < 0x80 || c >= 0xA1 && c <= 0xDF) { } else if (c < 0x80 || (c >= 0xA1 && c <= 0xDF)) {
this_char = c; this_char = c;
pos += 1; pos += 1;
} else { } else {
@ -787,8 +787,8 @@ static inline int process_numeric_entity(const char **buf, unsigned *code_point)
/* strtol allows whitespace and other stuff in the beginning /* strtol allows whitespace and other stuff in the beginning
* we're not interested */ * we're not interested */
if (hexadecimal && !isxdigit(**buf) || if ((hexadecimal && !isxdigit(**buf)) ||
!hexadecimal && !isdigit(**buf)) { (!hexadecimal && !isdigit(**buf))) {
return FAILURE; return FAILURE;
} }
@ -821,9 +821,9 @@ static inline int process_named_entity_html(const char **buf, const char **start
* sequence of 8-bit code units. If in the ranges below, it represents * sequence of 8-bit code units. If in the ranges below, it represents
* necessarily a alpha character because none of the supported encodings * necessarily a alpha character because none of the supported encodings
* has an overlap with ASCII in the leading byte (only on the second one) */ * has an overlap with ASCII in the leading byte (only on the second one) */
while (**buf >= 'a' && **buf <= 'z' || while ((**buf >= 'a' && **buf <= 'z') ||
**buf >= 'A' && **buf <= 'Z' || (**buf >= 'A' && **buf <= 'Z') ||
**buf >= '0' && **buf <= '9') { (**buf >= '0' && **buf <= '9')) {
(*buf)++; (*buf)++;
} }

74
ext/standard/html_tables/html_table_gen.php
View file

@ -25,7 +25,7 @@ $t = <<<CODE
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 5 | | PHP Version 5 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997-2010 The PHP Group | | Copyright (c) 1997-%s The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, | | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |
@ -119,7 +119,7 @@ typedef struct {
CODE; CODE;
echo $t; echo sprintf($t, date("Y"));
$encodings = array( $encodings = array(
array( array(
@ -213,7 +213,7 @@ foreach ($encodings as $e) {
$s2tables_idents[$i] = $e["ident"]; $s2tables_idents[$i] = $e["ident"];
echo "static const enc_to_uni_stage2 enc_to_uni_s2_{$e['ident']}_". echo "static const enc_to_uni_stage2 enc_to_uni_s2_{$e['ident']}_".
sprintf("%02X", $i << 6)." = {\n"; sprintf("%02X", $i << 6)." = { {\n";
for ($j = 0; $j < 64; $j++) { for ($j = 0; $j < 64; $j++) {
if ($j == 0) echo "\t"; if ($j == 0) echo "\t";
elseif ($j % 6 == 0) echo "\n\t"; elseif ($j % 6 == 0) echo "\n\t";
@ -223,7 +223,7 @@ foreach ($encodings as $e) {
else else
echo "0xFFFF,"; /* special value; indicates no mapping */ echo "0xFFFF,"; /* special value; indicates no mapping */
} }
echo "\n};\n\n"; echo "\n} };\n\n";
$prevStage2[] = $mstable[$i]; $prevStage2[] = $mstable[$i];
} }
@ -235,11 +235,11 @@ foreach ($encodings as $e) {
"/* {{{ Stage 1 table for {$e['name']} */\n"; "/* {{{ Stage 1 table for {$e['name']} */\n";
echo echo
"static const enc_to_uni enc_to_uni_{$e['ident']} = { "static const enc_to_uni enc_to_uni_{$e['ident']} = { {
\t&enc_to_uni_s2_{$s2tables_idents[0]}_00, \t&enc_to_uni_s2_{$s2tables_idents[0]}_00,
\t&enc_to_uni_s2_{$s2tables_idents[1]}_40, \t&enc_to_uni_s2_{$s2tables_idents[1]}_40,
\t&enc_to_uni_s2_{$s2tables_idents[2]}_80, \t&enc_to_uni_s2_{$s2tables_idents[2]}_80,
\t&enc_to_uni_s2_{$s2tables_idents[3]}_C0, \t&enc_to_uni_s2_{$s2tables_idents[3]}_C0 }
}; };
"; ";
@ -471,17 +471,17 @@ foreach ($multicp_rows as $k => $v) {
if (key_exists("default", $v)) { if (key_exists("default", $v)) {
if ($v['default'] == 'GT') /* hack to make > translate to &gt; not GT; */ if ($v['default'] == 'GT') /* hack to make > translate to &gt; not GT; */
$v['default'] = "gt"; $v['default'] = "gt";
echo "\t{", sprintf("%02d", count($v) - 1), echo "\t{ {", sprintf("%02d", count($v) - 1),
",\t\t", sprintf("\"%-21s", $v["default"].'",'), "\t", ",\t\t", sprintf("\"%-21s", $v["default"].'",'), "\t",
sprintf("% 2d", strlen($v["default"])), '},', "\n"; sprintf("% 2d", strlen($v["default"])), '} },', "\n";
} else { } else {
echo "\t{", sprintf("%02d", count($v)), echo "\t{ {", sprintf("%02d", count($v)),
",\t\t", sprintf("%-22s", 'NULL'), ",\t0},\n"; ",\t\t", sprintf("%-22s", 'NULL'), ",\t0} },\n";
} }
unset($v["default"]); unset($v["default"]);
foreach ($v as $l => $w) { foreach ($v as $l => $w) {
echo "\t{", sprintf("0x%05s", $l), ",\t", sprintf("\"%-21s", $w.'",'), "\t", echo "\t{ {", sprintf("0x%05s", $l), ",\t", sprintf("\"%-21s", $w.'",'), "\t",
sprintf("% 2d", strlen($w)), '},', "\n"; sprintf("% 2d", strlen($w)), '} },', "\n";
} }
echo "};\n"; echo "};\n";
} }
@ -495,22 +495,22 @@ if ($pass2 < 2)
$t = <<<CODE $t = <<<CODE
static const entity_stage3_row empty_stage3_table[] = { static const entity_stage3_row empty_stage3_table[] = {
/* 64 elements */ /* 64 elements */
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
{0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, NULL, 0}, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } }, {0, { {NULL, 0} } },
}; };
CODE; CODE;
@ -550,14 +550,14 @@ for ($i = 0; $i < 0x1E; $i++) {
elseif ($y % 4 == 0) echo "\n\t"; elseif ($y % 4 == 0) echo "\n\t";
else echo " "; else echo " ";
if ($z === NULL) if ($z === NULL)
echo "{0, NULL, 0},"; echo "{0, { {NULL, 0} } },";
elseif ($z === "QUOT") /* hack to translate " into &quote;, not &QUOT; */ elseif ($z === "QUOT") /* hack to translate " into &quote;, not &QUOT; */
echo "{0, \"quot\", 4},"; echo "{0, { {\"quot\", 4} } },";
elseif ($z !== "") elseif ($z !== "")
echo "{0, \"$z\", ", strlen($z), "},"; echo "{0, { {\"$z\", ", strlen($z), "} } },";
else else
echo "{1, (void*)", sprintf("multi_cp_{$ident}_%05X", echo "{1, { {(void *)", sprintf("multi_cp_{$ident}_%05X",
($i << 12) | ($k << 6) | $y ), "},"; ($i << 12) | ($k << 6) | $y ), "} } },";
} }
echo "\n};\n\n"; echo "\n};\n\n";
@ -712,7 +712,7 @@ typedef struct {
const entity_ht_bucket *buckets; /* .num_elems elements */ const entity_ht_bucket *buckets; /* .num_elems elements */
} entity_ht; } entity_ht;
static const entity_cp_map ht_bucket_empty[] = { NULL }; static const entity_cp_map ht_bucket_empty[] = { {NULL, 0, 0, 0} };
CODE; CODE;
@ -726,9 +726,9 @@ function hashfun($str)
$nKeyLength = strlen($str); $nKeyLength = strlen($str);
$pos = 0; $pos = 0;
/* variant with the hash unrolled eight times */
for (; $nKeyLength > 0; $nKeyLength--) { for (; $nKeyLength > 0; $nKeyLength--) {
$hash = (int)(((int)(((int)($hash << 5)) + $hash)) + ord($str[$pos++])); $hash = (int)(((int)(((int)($hash << 5)) + $hash)) + ord($str[$pos++]))
& 0xFFFFFFFF;
} }
return $hash; return $hash;
@ -762,7 +762,7 @@ for ($i = 0; $i < $numelems; $i++) {
$h[0], strlen($h[0]), hexdec($h[1])); $h[0], strlen($h[0]), hexdec($h[1]));
} }
} }
echo " {NULL} };\n"; echo " {NULL, 0, 0, 0} };\n";
} }
echo "\n"; echo "\n";