diff options
author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-08-31 05:45:02 +0000 |
---|---|---|
committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-08-31 05:45:02 +0000 |
commit | 1a9d43a807ae7176c4490c083d23f86845c62905 (patch) | |
tree | 0b193a1dce9bdb5f6e781b51f75020e10beabcdb /ext/standard/html_tables | |
parent | 2459296ff50386b90df59d86a47599aeb2fb9d97 (diff) | |
download | php-git-1a9d43a807ae7176c4490c083d23f86845c62905.tar.gz |
- Less GCC warnings; code less readable, yay!
- 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
Diffstat (limited to 'ext/standard/html_tables')
-rw-r--r-- | ext/standard/html_tables/html_table_gen.php | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php index 05997f0375..7e7314fa35 100644 --- a/ext/standard/html_tables/html_table_gen.php +++ b/ext/standard/html_tables/html_table_gen.php @@ -25,7 +25,7 @@ $t = <<<CODE +----------------------------------------------------------------------+ | 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, | | that is bundled with this package in the file LICENSE, and is | @@ -119,7 +119,7 @@ typedef struct { CODE; -echo $t; +echo sprintf($t, date("Y")); $encodings = array( array( @@ -213,7 +213,7 @@ foreach ($encodings as $e) { $s2tables_idents[$i] = $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++) { if ($j == 0) echo "\t"; elseif ($j % 6 == 0) echo "\n\t"; @@ -223,7 +223,7 @@ foreach ($encodings as $e) { else echo "0xFFFF,"; /* special value; indicates no mapping */ } - echo "\n};\n\n"; + echo "\n} };\n\n"; $prevStage2[] = $mstable[$i]; } @@ -235,11 +235,11 @@ foreach ($encodings as $e) { "/* {{{ Stage 1 table for {$e['name']} */\n"; 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[1]}_40, \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 ($v['default'] == 'GT') /* hack to make > translate to > not 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", - sprintf("% 2d", strlen($v["default"])), '},', "\n"; + sprintf("% 2d", strlen($v["default"])), '} },', "\n"; } else { - echo "\t{", sprintf("%02d", count($v)), - ",\t\t", sprintf("%-22s", 'NULL'), ",\t0},\n"; + echo "\t{ {", sprintf("%02d", count($v)), + ",\t\t", sprintf("%-22s", 'NULL'), ",\t0} },\n"; } unset($v["default"]); foreach ($v as $l => $w) { - echo "\t{", sprintf("0x%05s", $l), ",\t", sprintf("\"%-21s", $w.'",'), "\t", - sprintf("% 2d", strlen($w)), '},', "\n"; + echo "\t{ {", sprintf("0x%05s", $l), ",\t", sprintf("\"%-21s", $w.'",'), "\t", + sprintf("% 2d", strlen($w)), '} },', "\n"; } echo "};\n"; } @@ -495,22 +495,22 @@ if ($pass2 < 2) $t = <<<CODE static const entity_stage3_row empty_stage3_table[] = { /* 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; @@ -550,14 +550,14 @@ for ($i = 0; $i < 0x1E; $i++) { elseif ($y % 4 == 0) echo "\n\t"; else echo " "; if ($z === NULL) - echo "{0, NULL, 0},"; + echo "{0, { {NULL, 0} } },"; elseif ($z === "QUOT") /* hack to translate " into "e;, not " */ - echo "{0, \"quot\", 4},"; + echo "{0, { {\"quot\", 4} } },"; elseif ($z !== "") - echo "{0, \"$z\", ", strlen($z), "},"; + echo "{0, { {\"$z\", ", strlen($z), "} } },"; else - echo "{1, (void*)", sprintf("multi_cp_{$ident}_%05X", - ($i << 12) | ($k << 6) | $y ), "},"; + echo "{1, { {(void *)", sprintf("multi_cp_{$ident}_%05X", + ($i << 12) | ($k << 6) | $y ), "} } },"; } echo "\n};\n\n"; @@ -712,7 +712,7 @@ typedef struct { const entity_ht_bucket *buckets; /* .num_elems elements */ } entity_ht; -static const entity_cp_map ht_bucket_empty[] = { NULL }; +static const entity_cp_map ht_bucket_empty[] = { {NULL, 0, 0, 0} }; CODE; @@ -726,9 +726,9 @@ function hashfun($str) $nKeyLength = strlen($str); $pos = 0; - /* variant with the hash unrolled eight times */ 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; @@ -762,7 +762,7 @@ for ($i = 0; $i < $numelems; $i++) { $h[0], strlen($h[0]), hexdec($h[1])); } } - echo " {NULL} };\n"; + echo " {NULL, 0, 0, 0} };\n"; } echo "\n"; |