From 6228480959a21db776dcd04684f427942e83bc42 Mon Sep 17 00:00:00 2001 From: Andrew Sidwell Date: Sat, 2 Aug 2008 02:19:01 +0000 Subject: Stop pretending Hubbub has an internal encoding. svn path=/trunk/hubbub/; revision=4859 --- include/hubbub/parser.h | 2 +- src/parser.c | 3 +-- test/parser.c | 2 +- test/tree.c | 2 +- test/tree2.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/hubbub/parser.h b/include/hubbub/parser.h index 4249426..5e8e2e7 100644 --- a/include/hubbub/parser.h +++ b/include/hubbub/parser.h @@ -52,7 +52,7 @@ typedef union hubbub_parser_optparams { } hubbub_parser_optparams; /* Create a hubbub parser */ -hubbub_parser *hubbub_parser_create(const char *enc, const char *int_enc, +hubbub_parser *hubbub_parser_create(const char *enc, hubbub_alloc alloc, void *pw); /* Destroy a hubbub parser */ void hubbub_parser_destroy(hubbub_parser *parser); diff --git a/src/parser.c b/src/parser.c index 26b2b1f..8b8dbc5 100644 --- a/src/parser.c +++ b/src/parser.c @@ -29,12 +29,11 @@ struct hubbub_parser { * Create a hubbub parser * * \param enc Source document encoding, or NULL to autodetect - * \param int_enc Desired encoding of document * \param alloc Memory (de)allocation function * \param pw Pointer to client-specific private data (may be NULL) * \return Pointer to parser instance, or NULL on error */ -hubbub_parser *hubbub_parser_create(const char *enc, const char *int_enc, +hubbub_parser *hubbub_parser_create(const char *enc, hubbub_alloc alloc, void *pw) { hubbub_parser *parser; diff --git a/test/parser.c b/test/parser.c index ba8dd31..63e39ff 100644 --- a/test/parser.c +++ b/test/parser.c @@ -38,7 +38,7 @@ int main(int argc, char **argv) /* Initialise library */ assert(hubbub_initialise(argv[1], myrealloc, NULL) == HUBBUB_OK); - parser = hubbub_parser_create("UTF-8", "UTF-8", myrealloc, NULL); + parser = hubbub_parser_create("UTF-8", myrealloc, NULL); assert(parser != NULL); params.token_handler.handler = token_handler; diff --git a/test/tree.c b/test/tree.c index ae947a0..ff8f49a 100644 --- a/test/tree.c +++ b/test/tree.c @@ -103,7 +103,7 @@ int main(int argc, char **argv) /* Initialise library */ assert(hubbub_initialise(argv[1], myrealloc, NULL) == HUBBUB_OK); - parser = hubbub_parser_create("UTF-8", "UTF-8", myrealloc, NULL); + parser = hubbub_parser_create("UTF-8", myrealloc, NULL); assert(parser != NULL); params.tree_handler = &tree_handler; diff --git a/test/tree2.c b/test/tree2.c index 0f181ef..62efb46 100644 --- a/test/tree2.c +++ b/test/tree2.c @@ -144,7 +144,7 @@ static hubbub_parser *setup_parser(void) hubbub_parser *parser; hubbub_parser_optparams params; - parser = hubbub_parser_create("UTF-8", "UTF-8", myrealloc, NULL); + parser = hubbub_parser_create("UTF-8", myrealloc, NULL); assert(parser != NULL); params.tree_handler = &tree_handler; -- cgit v1.2.3