From 33c8fd789dd967e4417157ef511fbd7dd33c209e Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:37:16 +0100 Subject: charset_conv: mp_msg conversions --- misc/charset_conv.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'misc/charset_conv.h') diff --git a/misc/charset_conv.h b/misc/charset_conv.h index c216ede2be..e9efa48444 100644 --- a/misc/charset_conv.h +++ b/misc/charset_conv.h @@ -4,6 +4,8 @@ #include #include "bstr/bstr.h" +struct mp_log; + enum { MP_ICONV_VERBOSE = 1, // print errors instead of failing silently MP_ICONV_ALLOW_CUTOFF = 2, // allow partial input data @@ -12,8 +14,10 @@ enum { bool mp_charset_is_utf8(const char *user_cp); bool mp_charset_requires_guess(const char *user_cp); -const char *mp_charset_guess(bstr buf, const char *user_cp, int flags); -bstr mp_charset_guess_and_conv_to_utf8(bstr buf, const char *user_cp, int flags); -bstr mp_iconv_to_utf8(bstr buf, const char *cp, int flags); +const char *mp_charset_guess(struct mp_log *log, bstr buf, const char *user_cp, + int flags); +bstr mp_charset_guess_and_conv_to_utf8(struct mp_log *log, bstr buf, + const char *user_cp, int flags); +bstr mp_iconv_to_utf8(struct mp_log *log, bstr buf, const char *cp, int flags); #endif -- cgit v1.2.3