oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/icu/Converter: remove GLib implementation

Browse Source 
We don't need this anymore: Win32 doesn't use this library at all, and
everything else has either iconv() or libicu.
This commit is contained in:
Max Kellermann 2015-06-26 16:51:18 +02:00
parent 0756607e32
commit 3fa4dad418
3 changed files with 3 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fs/Charset.hxx
View File

@ -24,7 +24,7 @@
#include "Compiler.h" #include "Compiler.h"
#include "Traits.hxx" #include "Traits.hxx"
#if (defined(HAVE_ICU) || defined(HAVE_ICONV) || defined(HAVE_GLIB)) && !defined(WIN32) #if (defined(HAVE_ICU) || defined(HAVE_ICONV)) && !defined(WIN32)
#define HAVE_FS_CHARSET #define HAVE_FS_CHARSET
#endif #endif

41
src/lib/icu/Converter.cxx
View File

@ -34,9 +34,6 @@
#elif defined(HAVE_ICONV) #elif defined(HAVE_ICONV)
#include "util/Domain.hxx" #include "util/Domain.hxx"
static constexpr Domain iconv_domain("iconv"); static constexpr Domain iconv_domain("iconv");
#elif defined(HAVE_GLIB)
#include "util/Domain.hxx"
static constexpr Domain g_iconv_domain("g_iconv");
#endif #endif
#ifdef HAVE_ICU #ifdef HAVE_ICU
@ -77,20 +74,6 @@ IcuConverter::Create(const char *charset, Error &error)
return nullptr; return nullptr;
} }
return new IcuConverter(to, from);
#elif defined(HAVE_GLIB)
GIConv to = g_iconv_open("utf-8", charset);
GIConv from = g_iconv_open(charset, "utf-8");
if (to == (GIConv)-1 || from == (GIConv)-1) {
if (to != (GIConv)-1)
g_iconv_close(to);
if (from != (GIConv)-1)
g_iconv_close(from);
error.Format(g_iconv_domain,
"Failed to initialize charset '%s'", charset);
return nullptr;
}
return new IcuConverter(to, from); return new IcuConverter(to, from);
#endif #endif
} }
@ -116,26 +99,6 @@ DoConvert(iconv_t conv, const char *src)
return AllocatedString<>::Duplicate(buffer, sizeof(buffer) - out_left); return AllocatedString<>::Duplicate(buffer, sizeof(buffer) - out_left);
} }
#elif defined(HAVE_GLIB)
static AllocatedString<char>
DoConvert(GIConv conv, const char *src)
{
// TODO: dynamic buffer?
char buffer[4096];
char *in = const_cast<char *>(src);
char *out = buffer;
size_t in_left = strlen(src);
size_t out_left = sizeof(buffer);
size_t n = g_iconv(conv, &in, &in_left, &out, &out_left);
if (n == static_cast<size_t>(-1) || in_left > 0)
return nullptr;
return AllocatedString<>::Duplicate(buffer, sizeof(buffer) - out_left);
}
#endif #endif
AllocatedString<char> AllocatedString<char>
@ -160,7 +123,7 @@ IcuConverter::ToUTF8(const char *s) const
const size_t target_length = target - buffer; const size_t target_length = target - buffer;
return UCharToUTF8({buffer, target_length}); return UCharToUTF8({buffer, target_length});
#elif defined(HAVE_ICONV) || defined(HAVE_GLIB) #elif defined(HAVE_ICONV)
return DoConvert(to_utf8, s); return DoConvert(to_utf8, s);
#endif #endif
} }
@ -192,7 +155,7 @@ IcuConverter::FromUTF8(const char *s) const
return AllocatedString<>::Duplicate(buffer, target); return AllocatedString<>::Duplicate(buffer, target);
#elif defined(HAVE_ICONV) || defined(HAVE_GLIB) #elif defined(HAVE_ICONV)
return DoConvert(from_utf8, s); return DoConvert(from_utf8, s);
#endif #endif
} }

13
src/lib/icu/Converter.hxx
View File

@ -29,9 +29,6 @@
#elif defined(HAVE_ICONV) #elif defined(HAVE_ICONV)
#include <iconv.h> #include <iconv.h>
#define HAVE_ICU_CONVERTER #define HAVE_ICU_CONVERTER
#elif defined(HAVE_GLIB)
#include <glib.h>
#define HAVE_ICU_CONVERTER
#endif #endif
#ifdef HAVE_ICU_CONVERTER #ifdef HAVE_ICU_CONVERTER
@ -64,11 +61,6 @@ class IcuConverter {
IcuConverter(iconv_t _to, iconv_t _from) IcuConverter(iconv_t _to, iconv_t _from)
:to_utf8(_to), from_utf8(_from) {} :to_utf8(_to), from_utf8(_from) {}
#elif defined(HAVE_GLIB)
const GIConv to_utf8, from_utf8;
IcuConverter(GIConv _to, GIConv _from)
:to_utf8(_to), from_utf8(_from) {}
#endif #endif
public: public:
@ -79,11 +71,6 @@ public:
iconv_close(to_utf8); iconv_close(to_utf8);
iconv_close(from_utf8); iconv_close(from_utf8);
} }
#elif defined(HAVE_GLIB)
~IcuConverter() {
g_iconv_close(to_utf8);
g_iconv_close(from_utf8);
}
#endif #endif
static IcuConverter *Create(const char *charset, Error &error); static IcuConverter *Create(const char *charset, Error &error);