From 2fee3114b46682b220c73aae7c4f2466dedb81ff Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sat, 4 Dec 2010 15:28:50 +0000 Subject: Remove init/final code and turn aliases into static data structure. r=vince svn path=/trunk/libparserutils/; revision=10961 --- src/charset/aliases.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/charset/aliases.h') diff --git a/src/charset/aliases.h b/src/charset/aliases.h index 9abd2c8..189f8d5 100644 --- a/src/charset/aliases.h +++ b/src/charset/aliases.h @@ -13,24 +13,14 @@ #include typedef struct parserutils_charset_aliases_canon { - struct parserutils_charset_aliases_canon *next; + /* Do not change the ordering here without changing make-aliases.pl */ uint16_t mib_enum; uint16_t name_len; - char name[1]; + const char *name; } parserutils_charset_aliases_canon; -/* Load encoding aliases from file */ -parserutils_error parserutils_charset_aliases_create(const char *filename, - parserutils_alloc alloc, void *pw); -/* Destroy encoding aliases */ -void parserutils_charset_aliases_destroy(parserutils_alloc alloc, void *pw); - /* Canonicalise an alias name */ parserutils_charset_aliases_canon *parserutils_charset_alias_canonicalise( const char *alias, size_t len); -#ifndef NDEBUG -void parserutils_charset_aliases_dump(void); -#endif - #endif -- cgit v1.2.3