summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
6 files changed, 21 insertions, 21 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. */