From d207bdd33e07558a0dff07123cecffc0d49084e7 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sun, 5 Aug 2012 22:39:17 +0100 Subject: Move document out parameter after in parameters. --- bindings/hubbub/parser.c | 18 +++++++++--------- bindings/hubbub/parser.h | 8 ++++++-- test/testutils/load.c | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/bindings/hubbub/parser.c b/bindings/hubbub/parser.c index f0e088e..6174823 100644 --- a/bindings/hubbub/parser.c +++ b/bindings/hubbub/parser.c @@ -710,23 +710,23 @@ dom_hubbub_parser_default_script(void *ctx, struct dom_node *node) /** * Create a Hubbub parser instance * - * \param enc Source charset, or NULL - * \param fix_enc Whether fix the encoding - * \param enable_script Whether scripting should be enabled. - * \param document Dom document return parameter. - * \param msg Informational message function - * \param script Script callback function - * \param mctx Pointer to client-specific private data + * \param enc Source charset, or NULL + * \param fix_enc Whether fix the encoding + * \param enable_script Whether scripting should be enabled. + * \param msg Informational message function + * \param script Script callback function + * \param mctx Pointer to client-specific private data + * \param document Pointer to location to receive document * \return Pointer to instance, or NULL on memory exhaustion */ dom_hubbub_parser * dom_hubbub_parser_create(const char *enc, bool fix_enc, bool enable_script, - dom_document **document, dom_msg msg, dom_script script, - void *mctx) + void *mctx, + dom_document **document) { dom_hubbub_parser *parser; hubbub_parser_optparams params; diff --git a/bindings/hubbub/parser.h b/bindings/hubbub/parser.h index e4bd52a..a35cfd1 100644 --- a/bindings/hubbub/parser.h +++ b/bindings/hubbub/parser.h @@ -53,7 +53,10 @@ typedef enum dom_hubbub_encoding_source { */ /* Create a Hubbub parser instance */ -dom_hubbub_parser *dom_hubbub_parser_create(const char *enc, bool fix_enc, bool enable_script, dom_document **document, dom_msg msg, dom_script script, void *mctx); +dom_hubbub_parser *dom_hubbub_parser_create(const char *enc, bool fix_enc, + bool enable_script, dom_msg msg, + dom_script script, void *mctx, + dom_document **document); /* Destroy a Hubbub parser instance */ void dom_hubbub_parser_destroy(dom_hubbub_parser *parser); @@ -63,7 +66,8 @@ dom_hubbub_error dom_hubbub_parser_parse_chunk(dom_hubbub_parser *parser, const uint8_t *data, size_t len); /* insert data into the parse stream but do not parse it */ -dom_hubbub_error dom_hubbub_parser_insert_chunk(dom_hubbub_parser *parser, const uint8_t *data, size_t length); +dom_hubbub_error dom_hubbub_parser_insert_chunk(dom_hubbub_parser *parser, + const uint8_t *data, size_t length); /* Notify parser that datastream is empty */ dom_hubbub_error dom_hubbub_parser_completed(dom_hubbub_parser *parser); diff --git a/test/testutils/load.c b/test/testutils/load.c index 322afe5..e072f10 100644 --- a/test/testutils/load.c +++ b/test/testutils/load.c @@ -103,7 +103,7 @@ dom_document *load_html(const char *file, bool willBeModified) UNUSED(willBeModified); - parser = dom_hubbub_parser_create(NULL, true, false, &ret, mymsg, NULL, NULL); + parser = dom_hubbub_parser_create(NULL, true, false, mymsg, NULL, NULL, &ret); if (parser == NULL) { fprintf(stderr, "Can't create Hubbub Parser\n"); return NULL; -- cgit v1.2.3