diff options
Diffstat (limited to 'src/charset/codecs/codec_8859.c')
-rw-r--r-- | src/charset/codecs/codec_8859.c | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/src/charset/codecs/codec_8859.c b/src/charset/codecs/codec_8859.c index 1b8fd37..c04eb87 100644 --- a/src/charset/codecs/codec_8859.c +++ b/src/charset/codecs/codec_8859.c @@ -66,9 +66,11 @@ typedef struct charset_8859_codec { } charset_8859_codec; static bool charset_8859_codec_handles_charset(const char *charset); -static parserutils_charset_codec *charset_8859_codec_create(const char *charset, - parserutils_alloc alloc, void *pw); -static void charset_8859_codec_destroy (parserutils_charset_codec *codec); +static parserutils_error charset_8859_codec_create(const char *charset, + parserutils_alloc alloc, void *pw, + parserutils_charset_codec **codec); +static parserutils_error charset_8859_codec_destroy( + parserutils_charset_codec *codec); static parserutils_error charset_8859_codec_encode( parserutils_charset_codec *codec, const uint8_t **source, size_t *sourcelen, @@ -125,12 +127,16 @@ bool charset_8859_codec_handles_charset(const char *charset) * \param charset The charset to read from / write to * \param alloc Memory (de)allocation function * \param pw Pointer to client-specific private data (may be NULL) - * \return Pointer to codec, or NULL on failure + * \param codec Pointer to location to receive codec + * \return PARSERUTILS_OK on success, + * PARSERUTILS_BADPARM on bad parameters, + * PARSERUTILS_NOMEM on memory exhausion */ -parserutils_charset_codec *charset_8859_codec_create(const char *charset, - parserutils_alloc alloc, void *pw) +parserutils_error charset_8859_codec_create(const char *charset, + parserutils_alloc alloc, void *pw, + parserutils_charset_codec **codec) { - charset_8859_codec *codec; + charset_8859_codec *c; uint16_t match = parserutils_charset_mibenum_from_name( charset, strlen(charset)); uint32_t *table = NULL; @@ -144,35 +150,40 @@ parserutils_charset_codec *charset_8859_codec_create(const char *charset, assert(table != NULL); - codec = alloc(NULL, sizeof(charset_8859_codec), pw); - if (codec == NULL) - return NULL; + c = alloc(NULL, sizeof(charset_8859_codec), pw); + if (c == NULL) + return PARSERUTILS_NOMEM; - codec->table = table; + c->table = table; - codec->read_buf[0] = 0; - codec->read_len = 0; + c->read_buf[0] = 0; + c->read_len = 0; - codec->write_buf[0] = 0; - codec->write_len = 0; + c->write_buf[0] = 0; + c->write_len = 0; /* Finally, populate vtable */ - codec->base.handler.destroy = charset_8859_codec_destroy; - codec->base.handler.encode = charset_8859_codec_encode; - codec->base.handler.decode = charset_8859_codec_decode; - codec->base.handler.reset = charset_8859_codec_reset; + c->base.handler.destroy = charset_8859_codec_destroy; + c->base.handler.encode = charset_8859_codec_encode; + c->base.handler.decode = charset_8859_codec_decode; + c->base.handler.reset = charset_8859_codec_reset; + + *codec = (parserutils_charset_codec *) c; - return (parserutils_charset_codec *) codec; + return PARSERUTILS_OK; } /** * Destroy an ISO-8859-n codec * * \param codec The codec to destroy + * \return PARSERUTILS_OK on success, appropriate error otherwise */ -void charset_8859_codec_destroy (parserutils_charset_codec *codec) +parserutils_error charset_8859_codec_destroy (parserutils_charset_codec *codec) { UNUSED(codec); + + return PARSERUTILS_OK; } /** |