diff --git a/src/libcdio/cdio/utf8.h b/src/libcdio/cdio/utf8.h index ef150622..c7e63e1a 100644 --- a/src/libcdio/cdio/utf8.h +++ b/src/libcdio/cdio/utf8.h @@ -26,7 +26,7 @@ /** \brief Opaque characterset converter */ -typedef struct cdio_charset_coverter_s cdio_charset_coverter_t; +typedef struct cdio_charset_converter_s cdio_charset_converter_t; /** \brief Create a charset converter * \param src_charset Source charset @@ -34,7 +34,7 @@ typedef struct cdio_charset_coverter_s cdio_charset_coverter_t; * \returns A newly allocated charset converter */ -cdio_charset_coverter_t * +cdio_charset_converter_t * cdio_charset_converter_create(const char * src_charset, const char * dst_charset); @@ -42,7 +42,7 @@ cdio_charset_converter_create(const char * src_charset, * \param cnv A characterset converter */ -void cdio_charset_converter_destroy(cdio_charset_coverter_t*cnv); +void cdio_charset_converter_destroy(cdio_charset_converter_t*cnv); /** \brief Convert a string from one character set to another * \param cnv A charset converter @@ -56,7 +56,7 @@ void cdio_charset_converter_destroy(cdio_charset_coverter_t*cnv); * If you pass -1 for src_len, strlen() will be used. */ -bool cdio_charset_convert(cdio_charset_coverter_t*cnv, +bool cdio_charset_convert(cdio_charset_converter_t*cnv, char * src, int src_len, char ** dst, int * dst_len); diff --git a/src/libcdio/driver/utf8.c b/src/libcdio/driver/utf8.c index 5279d063..e02a5327 100644 --- a/src/libcdio/driver/utf8.c +++ b/src/libcdio/driver/utf8.c @@ -116,16 +116,16 @@ FILE* fopen_utf8(const char* filename, const char* mode) #ifdef HAVE_JOLIET #ifdef HAVE_ICONV #include -struct cdio_charset_coverter_s +struct cdio_charset_converter_s { iconv_t ic; }; -cdio_charset_coverter_t * +cdio_charset_converter_t * cdio_charset_converter_create(const char * src_charset, const char * dst_charset) { - cdio_charset_coverter_t * ret; + cdio_charset_converter_t * ret; ret = calloc(1, sizeof(*ret)); ret->ic = iconv_open(dst_charset, src_charset); return ret; @@ -158,7 +158,7 @@ static void bgav_hexdump(uint8_t * data, int len, int linebreak) } #endif -void cdio_charset_converter_destroy(cdio_charset_coverter_t*cnv) +void cdio_charset_converter_destroy(cdio_charset_converter_t*cnv) { iconv_close(cnv->ic); free(cnv); @@ -246,7 +246,7 @@ do_convert(iconv_t cd, const char * src, int src_len, return true; } -bool cdio_charset_convert(cdio_charset_coverter_t*cnv, +bool cdio_charset_convert(cdio_charset_converter_t*cnv, char * src, int src_len, char ** dst, int * dst_len) {