Attachment #78298 for bug #120387

View | Details | Raw Unified | Return to bug 120387
Collapse All | Expand All

Lines 271-280 int utf8ToEncoding(const char *from, cha Link Here

(-)libtunepimp-0.4.0.orig/lib/utf8/utf8.c (-1 / +2 lines)
271		271
272	#else /* End win32. Rest is for real operating systems */	272	#else /* End win32. Rest is for real operating systems */
273		273
		274	#ifdef HAVE_ICONV
274	int iconvert(const char fromcode, const char tocode,	275	int iconvert(const char fromcode, const char tocode,
275	const char *from, size_t fromlen,	276	const char *from, size_t fromlen,
276	char *to, size_t tolen);	277	char *to, size_t tolen);
277		278	#endif
278	static char current_charset = 0; / means "US-ASCII" */	279	static char current_charset = 0; / means "US-ASCII" */
279		280
280	void convert_set_charset(const char *charset)	281	void convert_set_charset(const char *charset)




    return to;
}

#if !defined(WIN32) && defined(HAVE_ICONV)
extern "C"
{
int iconvert(const char *fromcode, const char *tocode,


string utf8ToEncoding(const string &from, const string &encoding)
{
#if !defined(WIN32) && defined(HAVE_ICONV)
    string to;

    if (strcasecmp(encoding.c_str(), "utf-8") == 0)


string utf8FromEncoding(const string &from, const string &encoding)
{
#if !defined(WIN32) && defined(HAVE_ICONV)
    string to;

    if (strcasecmp(encoding.c_str(), "utf-8") == 0)

Return to bug 120387

Lines 64-70 string utf8Decode(const string &from) Link Here

(-)libtunepimp-0.4.0.orig/lib/utf8/utf8util.cpp (-3 / +3 lines)
64	return to;	64	return to;
65	}	65	}
66		66
67	#ifndef WIN32	67	#if !defined(WIN32) && defined(HAVE_ICONV)
68	extern "C"	68	extern "C"
69	{	69	{
70	int iconvert(const char fromcode, const char tocode,	70	int iconvert(const char fromcode, const char tocode,
Lines 75-81 int iconvert(const char *fromcode, const Link Here
75		75
76	string utf8ToEncoding(const string &from, const string &encoding)	76	string utf8ToEncoding(const string &from, const string &encoding)
77	{	77	{
78	#ifndef WIN32	78	#if !defined(WIN32) && defined(HAVE_ICONV)
79	string to;	79	string to;
80		80
81	if (strcasecmp(encoding.c_str(), "utf-8") == 0)	81	if (strcasecmp(encoding.c_str(), "utf-8") == 0)
Lines 106-112 string utf8ToEncoding(const string &from Link Here
106		106
107	string utf8FromEncoding(const string &from, const string &encoding)	107	string utf8FromEncoding(const string &from, const string &encoding)
108	{	108	{
109	#ifndef WIN32	109	#if !defined(WIN32) && defined(HAVE_ICONV)
110	string to;	110	string to;
111		111
112	if (strcasecmp(encoding.c_str(), "utf-8") == 0)	112	if (strcasecmp(encoding.c_str(), "utf-8") == 0)