summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2011-01-26 13:06:13 (GMT)
committer Daniel Silverstone <dsilvers@netsurf-browser.org>2011-01-26 13:06:13 (GMT)
commita83d0600592a89c8b0a66130ae5c583f3d104dd8 (patch)
tree3fdd533a44e75fbecc41b856cc6e2c38ff81bd16
parent59024da51c2f23f4d5d357cf57a8c33b78335bd5 (diff)
downloadlibparserutils-a83d0600592a89c8b0a66130ae5c583f3d104dd8.tar.gz
libparserutils-a83d0600592a89c8b0a66130ae5c583f3d104dd8.tar.bz2
Internalise the internal symbol names.
svn path=/trunk/libparserutils/; revision=11493
-rw-r--r--src/charset/aliases.c4
-rw-r--r--src/charset/aliases.h2
-rw-r--r--src/charset/codec.c2
-rw-r--r--src/input/filter.c10
-rw-r--r--src/input/filter.h10
-rw-r--r--src/input/inputstream.c14
-rw-r--r--test/aliases.c10
-rw-r--r--test/filter.c64
-rw-r--r--test/regression/filter-badenc-segv.c8
-rw-r--r--test/regression/filter-segv.c4
10 files changed, 64 insertions, 64 deletions
diff --git a/src/charset/aliases.c b/src/charset/aliases.c
index 88b633c..328e56f 100644
--- a/src/charset/aliases.c
+++ b/src/charset/aliases.c
@@ -76,7 +76,7 @@ static int parserutils_charset_alias_match(const void *a, const void *b)
* \param len The length of the alias name
* \return Pointer to canonical form or NULL if not found
*/
-parserutils_charset_aliases_canon *parserutils_charset_alias_canonicalise(
+parserutils_charset_aliases_canon *parserutils__charset_alias_canonicalise(
const char *alias, size_t len)
{
parserutils_charset_aliases_alias *c;
@@ -111,7 +111,7 @@ uint16_t parserutils_charset_mibenum_from_name(const char *alias, size_t len)
if (alias == NULL)
return 0;
- c = parserutils_charset_alias_canonicalise(alias, len);
+ c = parserutils__charset_alias_canonicalise(alias, len);
if (c == NULL)
return 0;
diff --git a/src/charset/aliases.h b/src/charset/aliases.h
index 189f8d5..028f48c 100644
--- a/src/charset/aliases.h
+++ b/src/charset/aliases.h
@@ -20,7 +20,7 @@ typedef struct parserutils_charset_aliases_canon {
} parserutils_charset_aliases_canon;
/* Canonicalise an alias name */
-parserutils_charset_aliases_canon *parserutils_charset_alias_canonicalise(
+parserutils_charset_aliases_canon *parserutils__charset_alias_canonicalise(
const char *alias, size_t len);
#endif
diff --git a/src/charset/codec.c b/src/charset/codec.c
index 3a52ac0..ed095cc 100644
--- a/src/charset/codec.c
+++ b/src/charset/codec.c
@@ -50,7 +50,7 @@ parserutils_error parserutils_charset_codec_create(const char *charset,
return PARSERUTILS_BADPARM;
/* Canonicalise parserutils_charset name. */
- canon = parserutils_charset_alias_canonicalise(charset,
+ canon = parserutils__charset_alias_canonicalise(charset,
strlen(charset));
if (canon == NULL)
return PARSERUTILS_BADENCODING;
diff --git a/src/input/filter.c b/src/input/filter.c
index 45e0b56..8055bd8 100644
--- a/src/input/filter.c
+++ b/src/input/filter.c
@@ -60,7 +60,7 @@ static parserutils_error filter_set_encoding(parserutils_filter *input,
* PARSERUTILS_NOMEM on memory exhausion,
* PARSERUTILS_BADENCODING if the encoding is unsupported
*/
-parserutils_error parserutils_filter_create(const char *int_enc,
+parserutils_error parserutils__filter_create(const char *int_enc,
parserutils_alloc alloc, void *pw, parserutils_filter **filter)
{
parserutils_filter *f;
@@ -120,7 +120,7 @@ parserutils_error parserutils_filter_create(const char *int_enc,
* \param input Pointer to filter instance
* \return PARSERUTILS_OK on success, appropriate error otherwise
*/
-parserutils_error parserutils_filter_destroy(parserutils_filter *input)
+parserutils_error parserutils__filter_destroy(parserutils_filter *input)
{
if (input == NULL)
return PARSERUTILS_BADPARM;
@@ -155,7 +155,7 @@ parserutils_error parserutils_filter_destroy(parserutils_filter *input)
* \param params Option-specific parameters
* \return PARSERUTILS_OK on success, appropriate error otherwise
*/
-parserutils_error parserutils_filter_setopt(parserutils_filter *input,
+parserutils_error parserutils__filter_setopt(parserutils_filter *input,
parserutils_filter_opttype type,
parserutils_filter_optparams *params)
{
@@ -185,7 +185,7 @@ parserutils_error parserutils_filter_setopt(parserutils_filter *input,
*
* Call this with an input buffer length of 0 to flush any buffers.
*/
-parserutils_error parserutils_filter_process_chunk(parserutils_filter *input,
+parserutils_error parserutils__filter_process_chunk(parserutils_filter *input,
const uint8_t **data, size_t *len,
uint8_t **output, size_t *outlen)
{
@@ -307,7 +307,7 @@ parserutils_error parserutils_filter_process_chunk(parserutils_filter *input,
* \param input The input filter to reset
* \return PARSERUTILS_OK on success, appropriate error otherwise
*/
-parserutils_error parserutils_filter_reset(parserutils_filter *input)
+parserutils_error parserutils__filter_reset(parserutils_filter *input)
{
parserutils_error error = PARSERUTILS_OK;
diff --git a/src/input/filter.h b/src/input/filter.h
index c9f2053..13473f2 100644
--- a/src/input/filter.h
+++ b/src/input/filter.h
@@ -35,23 +35,23 @@ typedef union parserutils_filter_optparams {
/* Create an input filter */
-parserutils_error parserutils_filter_create(const char *int_enc,
+parserutils_error parserutils__filter_create(const char *int_enc,
parserutils_alloc alloc, void *pw, parserutils_filter **filter);
/* Destroy an input filter */
-parserutils_error parserutils_filter_destroy(parserutils_filter *input);
+parserutils_error parserutils__filter_destroy(parserutils_filter *input);
/* Configure an input filter */
-parserutils_error parserutils_filter_setopt(parserutils_filter *input,
+parserutils_error parserutils__filter_setopt(parserutils_filter *input,
parserutils_filter_opttype type,
parserutils_filter_optparams *params);
/* Process a chunk of data */
-parserutils_error parserutils_filter_process_chunk(parserutils_filter *input,
+parserutils_error parserutils__filter_process_chunk(parserutils_filter *input,
const uint8_t **data, size_t *len,
uint8_t **output, size_t *outlen);
/* Reset an input filter's state */
-parserutils_error parserutils_filter_reset(parserutils_filter *input);
+parserutils_error parserutils__filter_reset(parserutils_filter *input);
#endif
diff --git a/src/input/inputstream.c b/src/input/inputstream.c
index 73c038d..31f83a8 100644
--- a/src/input/inputstream.c
+++ b/src/input/inputstream.c
@@ -93,7 +93,7 @@ parserutils_error parserutils_inputstream_create(const char *enc,
s->public.had_eof = false;
s->done_first_chunk = false;
- error = parserutils_filter_create("UTF-8", alloc, pw, &s->input);
+ error = parserutils__filter_create("UTF-8", alloc, pw, &s->input);
if (error != PARSERUTILS_OK) {
parserutils_buffer_destroy(s->public.utf8);
parserutils_buffer_destroy(s->raw);
@@ -112,11 +112,11 @@ parserutils_error parserutils_inputstream_create(const char *enc,
params.encoding.name = enc;
- error = parserutils_filter_setopt(s->input,
+ error = parserutils__filter_setopt(s->input,
PARSERUTILS_FILTER_SET_ENCODING,
&params);
if (error != PARSERUTILS_OK) {
- parserutils_filter_destroy(s->input);
+ parserutils__filter_destroy(s->input);
parserutils_buffer_destroy(s->public.utf8);
parserutils_buffer_destroy(s->raw);
alloc(s, 0, pw);
@@ -154,7 +154,7 @@ parserutils_error parserutils_inputstream_destroy(
if (stream == NULL)
return PARSERUTILS_BADPARM;
- parserutils_filter_destroy(s->input);
+ parserutils__filter_destroy(s->input);
parserutils_buffer_destroy(s->public.utf8);
parserutils_buffer_destroy(s->raw);
s->alloc(s, 0, s->pw);
@@ -344,7 +344,7 @@ parserutils_error parserutils_inputstream_change_charset(
/* Ensure filter is using the correct encoding */
params.encoding.name = enc;
- error = parserutils_filter_setopt(s->input,
+ error = parserutils__filter_setopt(s->input,
PARSERUTILS_FILTER_SET_ENCODING,
&params);
if (error != PARSERUTILS_OK)
@@ -424,7 +424,7 @@ parserutils_error parserutils_inputstream_refill_buffer(
params.encoding.name =
parserutils_charset_mibenum_to_name(stream->mibenum);
- error = parserutils_filter_setopt(stream->input,
+ error = parserutils__filter_setopt(stream->input,
PARSERUTILS_FILTER_SET_ENCODING,
&params);
if (error != PARSERUTILS_OK)
@@ -469,7 +469,7 @@ parserutils_error parserutils_inputstream_refill_buffer(
raw_length = stream->raw->length;
/* Try to fill utf8 buffer from the raw data */
- error = parserutils_filter_process_chunk(stream->input,
+ error = parserutils__filter_process_chunk(stream->input,
&raw, &raw_length, &utf8, &utf8_space);
/* _NOMEM implies that there's more input to read than available space
* in the utf8 buffer. That's fine, so we'll ignore that error. */
diff --git a/test/aliases.c b/test/aliases.c
index 3513c7f..5129012 100644
--- a/test/aliases.c
+++ b/test/aliases.c
@@ -12,13 +12,13 @@ int main (int argc, char **argv)
UNUSED(argc);
UNUSED(argv);
- c = parserutils_charset_alias_canonicalise("moose", 5);
+ c = parserutils__charset_alias_canonicalise("moose", 5);
if (c) {
printf("FAIL - found invalid encoding 'moose'\n");
return 1;
}
- c = parserutils_charset_alias_canonicalise("csinvariant", 11);
+ c = parserutils__charset_alias_canonicalise("csinvariant", 11);
if (c) {
printf("%s %d\n", c->name, c->mib_enum);
} else {
@@ -26,7 +26,7 @@ int main (int argc, char **argv)
return 1;
}
- c = parserutils_charset_alias_canonicalise("csinvariant\"", 12);
+ c = parserutils__charset_alias_canonicalise("csinvariant\"", 12);
if (c) {
printf("%s %d\n", c->name, c->mib_enum);
} else {
@@ -34,7 +34,7 @@ int main (int argc, char **argv)
return 1;
}
- c = parserutils_charset_alias_canonicalise("nats-sefi-add", 13);
+ c = parserutils__charset_alias_canonicalise("nats-sefi-add", 13);
if (c) {
printf("%s %d\n", c->name, c->mib_enum);
} else {
@@ -48,7 +48,7 @@ int main (int argc, char **argv)
printf("%s\n", parserutils_charset_mibenum_to_name(c->mib_enum));
- c = parserutils_charset_alias_canonicalise("u.t.f.8", 7);
+ c = parserutils__charset_alias_canonicalise("u.t.f.8", 7);
if (c) {
printf("%s %d\n", c->name, c->mib_enum);
} else {
diff --git a/test/filter.c b/test/filter.c
index dfbe38b..a34ade3 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -31,12 +31,12 @@ int main(int argc, char **argv)
UNUSED(argv);
/* Create input filter */
- assert(parserutils_filter_create("UTF-8", myrealloc, NULL, &input) ==
+ assert(parserutils__filter_create("UTF-8", myrealloc, NULL, &input) ==
PARSERUTILS_OK);
/* Convert filter to UTF-8 encoding */
params.encoding.name = "UTF-8";
- assert(parserutils_filter_setopt(input, PARSERUTILS_FILTER_SET_ENCODING,
+ assert(parserutils__filter_setopt(input, PARSERUTILS_FILTER_SET_ENCODING,
(parserutils_filter_optparams *) &params) ==
PARSERUTILS_OK);
@@ -49,14 +49,14 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 64;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xc2\xa0o!",
SLEN("hell\xc2\xa0o!")) == 0);
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 5;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_NOMEM);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -79,14 +79,14 @@ int main(int argc, char **argv)
outlen = 64 - 5 + outlen;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hello!",
SLEN("hello!")) == 0);
@@ -102,14 +102,14 @@ int main(int argc, char **argv)
/* Input does loose decoding, converting to U+FFFD if illegal
* input is encountered */
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xef\xbf\xbdo!",
SLEN("hell\xef\xbf\xbdo!")) == 0);
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 64;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -132,14 +132,14 @@ int main(int argc, char **argv)
inlen += 3;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xc2\xa0o!",
SLEN("hell\xc2\xa0o!")) == 0);
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 64;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
inlen += 3;
outlen = 3;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_NOMEM);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -173,14 +173,14 @@ int main(int argc, char **argv)
outlen = 64 - 7;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xc2\xa0o!",
SLEN("hell\xc2\xa0o!")) == 0);
@@ -195,7 +195,7 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 64;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
inlen += 3;
outlen = 1;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_NOMEM);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -214,14 +214,14 @@ int main(int argc, char **argv)
outlen = 60;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xc2\xa0o!",
SLEN("hell\xc2\xa0o!")) == 0);
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 64;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -247,14 +247,14 @@ int main(int argc, char **argv)
/* Input does loose decoding, converting to U+FFFD if illegal
* input is encountered */
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xef\xbf\xbd\xef\xbf\xbdo!",
SLEN("hell\xef\xbf\xbd\xef\xbf\xbdo!")) == 0);
@@ -269,7 +269,7 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 64;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -278,7 +278,7 @@ int main(int argc, char **argv)
inlen += 2;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -287,14 +287,14 @@ int main(int argc, char **argv)
inlen += 3;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xc2\xa0\xc2\xa1o!",
SLEN("hell\xc2\xa0\xc2\xa1o!")) == 0);
@@ -309,7 +309,7 @@ int main(int argc, char **argv)
outbuf[0] = '\0';
outlen = 64;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -318,7 +318,7 @@ int main(int argc, char **argv)
inlen += 1;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
@@ -327,21 +327,21 @@ int main(int argc, char **argv)
inlen += 3;
- assert(parserutils_filter_process_chunk(input, &in, &inlen,
+ assert(parserutils__filter_process_chunk(input, &in, &inlen,
&out, &outlen) == PARSERUTILS_OK);
printf("'%.*s' %d '%.*s' %d\n", (int) inlen, in, (int) inlen,
(int) (out - ((uint8_t *) outbuf)),
outbuf, (int) outlen);
- assert(parserutils_filter_reset(input) == PARSERUTILS_OK);
+ assert(parserutils__filter_reset(input) == PARSERUTILS_OK);
assert(memcmp(outbuf, "hell\xe2\x80\xa2o!",
SLEN("hell\xe2\x80\xa2o!")) == 0);
/* Clean up */
- parserutils_filter_destroy(input);
+ parserutils__filter_destroy(input);
printf("PASS\n");
diff --git a/test/regression/filter-badenc-segv.c b/test/regression/filter-badenc-segv.c
index 5ca77e3..874123b 100644
--- a/test/regression/filter-badenc-segv.c
+++ b/test/regression/filter-badenc-segv.c
@@ -29,20 +29,20 @@ int main(int argc, char **argv)
UNUSED(argc);
UNUSED(argv);
- assert(parserutils_filter_create("UTF-8", myrealloc, NULL, &input) ==
+ assert(parserutils__filter_create("UTF-8", myrealloc, NULL, &input) ==
PARSERUTILS_OK);
params.encoding.name = "GBK";
- assert(parserutils_filter_setopt(input,
+ assert(parserutils__filter_setopt(input,
PARSERUTILS_FILTER_SET_ENCODING, &params) ==
expected);
params.encoding.name = "GBK";
- assert(parserutils_filter_setopt(input,
+ assert(parserutils__filter_setopt(input,
PARSERUTILS_FILTER_SET_ENCODING, &params) ==
expected);
- parserutils_filter_destroy(input);
+ parserutils__filter_destroy(input);
printf("PASS\n");
diff --git a/test/regression/filter-segv.c b/test/regression/filter-segv.c
index b0e9586..364d8b1 100644
--- a/test/regression/filter-segv.c
+++ b/test/regression/filter-segv.c
@@ -21,10 +21,10 @@ int main(int argc, char **argv)
UNUSED(argc);
UNUSED(argv);
- assert(parserutils_filter_create("UTF-8", myrealloc, NULL, &input) ==
+ assert(parserutils__filter_create("UTF-8", myrealloc, NULL, &input) ==
PARSERUTILS_OK);
- parserutils_filter_destroy(input);
+ parserutils__filter_destroy(input);
printf("PASS\n");