summaryrefslogtreecommitdiffstats
path: root/enc
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-13 01:21:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-13 01:21:42 +0000
commitfc27a6e04341ec65efcaa43658ca6f517b47ceb5 (patch)
treec168419cb137beec1b458e53b7299a44b8630673 /enc
parent8739cef7291d90d86e3d54d147a639ebe9747c3b (diff)
downloadruby-fc27a6e04341ec65efcaa43658ca6f517b47ceb5.tar.gz
ruby-fc27a6e04341ec65efcaa43658ca6f517b47ceb5.tar.xz
ruby-fc27a6e04341ec65efcaa43658ca6f517b47ceb5.zip
* encoding.c (enc_table): packed all enc_table stuff.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rwxr-xr-xenc/make_encdb.rb18
1 files changed, 7 insertions, 11 deletions
diff --git a/enc/make_encdb.rb b/enc/make_encdb.rb
index b49f13c16..32dacbc74 100755
--- a/enc/make_encdb.rb
+++ b/enc/make_encdb.rb
@@ -40,25 +40,21 @@ open('encdb.h', 'wb') do |f|
replicas.each_key {|name| f.puts' "%s",' % name}
aliases.each_key {|name| f.puts' "%s",' % name}
f.puts(<<"_TEXT_")
- NULL
};
-static const int enc_name_list_size = #{encodings.length + replicas.length + aliases.length};
-static const int enc_aliases_size = #{aliases.length};
-static st_table *enc_table_replica_name;
-static st_table *enc_table_alias_name;
+#define enc_name_list_size (sizeof(enc_name_list)/sizeof(enc_name_list[0]))
static void enc_init_db(void)
{
- if (!enc_table_replica_name) {
- enc_table_replica_name = st_init_strcasetable();
+ if (!enc_table.replica_name) {
+ enc_table.replica_name = st_init_strcasetable();
}
- if (!enc_table_alias_name) {
- enc_table_alias_name = st_init_strcasetable();
+ if (!enc_table.alias_name) {
+ enc_table.alias_name = st_init_strcasetable();
}
_TEXT_
replicas.each_pair {|name, orig|
- f.puts' st_insert(enc_table_replica_name, (st_data_t)"%s", (st_data_t)"%s");' % [name, orig]}
+ f.puts' st_insert(enc_table.replica_name, (st_data_t)"%s", (st_data_t)"%s");' % [name, orig]}
aliases.each_pair {|name, orig|
- f.puts' st_insert(enc_table_alias_name, (st_data_t)"%s", (st_data_t)"%s");' % [name, orig]}
+ f.puts' st_insert(enc_table.alias_name, (st_data_t)"%s", (st_data_t)"%s");' % [name, orig]}
f.puts '}'
end