diff options
| author | Andrew Sidwell <andy@entai.co.uk> | 2008-08-10 16:48:32 +0000 |
|---|---|---|
| committer | Andrew Sidwell <andy@entai.co.uk> | 2008-08-10 16:48:32 +0000 |
| commit | 4aef3c775e93d5add0277941fe0ecccc91d4ccb3 (patch) | |
| tree | fa52e2dad3bdb51f28e48ecfd15e4d1dc8ba6bb7 | |
| parent | 5eb5ec3682ba75cec9616039c60987eeee26e5ee (diff) | |
| download | libhubbub-4aef3c775e93d5add0277941fe0ecccc91d4ccb3.tar.gz libhubbub-4aef3c775e93d5add0277941fe0ecccc91d4ccb3.tar.bz2 | |
Make the encoding change callback send the textual name rather than the mibenum value.
svn path=/trunk/hubbub/; revision=4992
| -rw-r--r-- | include/hubbub/functypes.h | 2 | ||||
| -rw-r--r-- | src/treebuilder/in_head.c | 8 | ||||
| -rw-r--r-- | test/tree.c | 1 | ||||
| -rw-r--r-- | test/tree2.c | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/include/hubbub/functypes.h b/include/hubbub/functypes.h index 8d26926..b525980 100644 --- a/include/hubbub/functypes.h +++ b/include/hubbub/functypes.h @@ -124,7 +124,7 @@ typedef int (*hubbub_tree_set_quirks_mode)(void *ctx, hubbub_quirks_mode mode); /** * Type of encoding change notification function */ -typedef int (*hubbub_tree_encoding_change)(void *ctx, uint16_t mibenum); +typedef int (*hubbub_tree_encoding_change)(void *ctx, const char *encname); #endif diff --git a/src/treebuilder/in_head.c b/src/treebuilder/in_head.c index ddb7453..88fcff5 100644 --- a/src/treebuilder/in_head.c +++ b/src/treebuilder/in_head.c @@ -62,16 +62,20 @@ static hubbub_error process_meta_in_head(hubbub_treebuilder *treebuilder, if (charset_enc != 0) { if (treebuilder->tree_handler->encoding_change) { + const char *name = parserutils_charset_mibenum_to_name( + charset_enc); treebuilder->tree_handler->encoding_change( treebuilder->tree_handler->ctx, - charset_enc); + name); } return HUBBUB_ENCODINGCHANGE; } else if (content_type_enc != 0) { if (treebuilder->tree_handler->encoding_change) { + const char *name = parserutils_charset_mibenum_to_name( + content_type_enc); treebuilder->tree_handler->encoding_change( treebuilder->tree_handler->ctx, - content_type_enc); + name); } return HUBBUB_ENCODINGCHANGE; } diff --git a/test/tree.c b/test/tree.c index ff8f49a..944d887 100644 --- a/test/tree.c +++ b/test/tree.c @@ -66,6 +66,7 @@ static hubbub_tree_handler tree_handler = { form_associate, add_attributes, set_quirks_mode, + NULL, NULL }; diff --git a/test/tree2.c b/test/tree2.c index c50b519..3e1e79e 100644 --- a/test/tree2.c +++ b/test/tree2.c @@ -114,6 +114,7 @@ static hubbub_tree_handler tree_handler = { form_associate, add_attributes, set_quirks_mode, + NULL, NULL }; |