diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2008-11-09 20:09:50 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2008-11-09 20:09:50 +0000 |
commit | 83c070f67a2c26672f0ddad9b7e9104c16d7015f (patch) | |
tree | 8baa79156f9e837972f4103e7d955d670b29f397 /test | |
parent | 93db0a01a331b1820ba26e1ced4cb288ee8bb47d (diff) | |
download | libcss-83c070f67a2c26672f0ddad9b7e9104c16d7015f.tar.gz libcss-83c070f67a2c26672f0ddad9b7e9104c16d7015f.tar.bz2 |
Port libcss to new lpu API.
Make lexer, core parser, and css21 parser constructors&destructors return errors
svn path=/trunk/libcss/; revision=5674
Diffstat (limited to 'test')
-rw-r--r-- | test/lex-auto.c | 9 | ||||
-rw-r--r-- | test/lex.c | 9 | ||||
-rw-r--r-- | test/parse.c | 5 |
3 files changed, 10 insertions, 13 deletions
diff --git a/test/lex-auto.c b/test/lex-auto.c index 98d0871..d336480 100644 --- a/test/lex-auto.c +++ b/test/lex-auto.c @@ -271,12 +271,11 @@ void run_test(const uint8_t *data, size_t len, exp_entry *exp, size_t explen) size_t e; static int testnum; - input = parserutils_inputstream_create("UTF-8", CSS_CHARSET_DICTATED, - css_charset_extract, myrealloc, NULL); - assert(input != NULL); + assert(parserutils_inputstream_create("UTF-8", CSS_CHARSET_DICTATED, + css_charset_extract, myrealloc, NULL, &input) == + PARSERUTILS_OK); - lexer = css_lexer_create(input, myrealloc, NULL); - assert(lexer != NULL); + assert(css_lexer_create(input, myrealloc, NULL, &lexer) == CSS_OK); assert(parserutils_inputstream_append(input, data, len) == PARSERUTILS_OK); @@ -129,13 +129,12 @@ int main(int argc, char **argv) /* Initialise library */ assert(css_initialise(argv[1], myrealloc, NULL) == CSS_OK); - stream = parserutils_inputstream_create("UTF-8", CSS_CHARSET_DICTATED, + assert(parserutils_inputstream_create("UTF-8", CSS_CHARSET_DICTATED, css_charset_extract, - (parserutils_alloc) myrealloc, NULL); - assert(stream != NULL); + (parserutils_alloc) myrealloc, NULL, &stream) == + PARSERUTILS_OK); - lexer = css_lexer_create(stream, myrealloc, NULL); - assert(lexer != NULL); + assert(css_lexer_create(stream, myrealloc, NULL, &lexer) == CSS_OK); fp = fopen(argv[2], "rb"); if (fp == NULL) { diff --git a/test/parse.c b/test/parse.c index 1752dc2..4ff9a6e 100644 --- a/test/parse.c +++ b/test/parse.c @@ -86,9 +86,8 @@ int main(int argc, char **argv) /* Initialise library */ assert(css_initialise(argv[1], myrealloc, NULL) == CSS_OK); - parser = css_parser_create("UTF-8", CSS_CHARSET_DICTATED, - myrealloc, NULL); - assert(parser != NULL); + assert(css_parser_create("UTF-8", CSS_CHARSET_DICTATED, + myrealloc, NULL, &parser) == CSS_OK); params.event_handler.handler = event_handler; params.event_handler.pw = NULL; |