LogBackend: remove character set support

Always write UTF-8 to the log file.
This commit is contained in:
Max Kellermann
2015-06-22 22:33:37 +02:00
parent 73bd6af0f9
commit 9f4f1bab39
4 changed files with 1 additions and 57 deletions

View File

@@ -23,10 +23,6 @@
#include "util/Domain.hxx"
#include "util/StringUtil.hxx"
#ifdef HAVE_GLIB
#include <glib.h>
#endif
#include <assert.h>
#include <stdio.h>
#include <string.h>
@@ -65,10 +61,6 @@ ToAndroidLogLevel(LogLevel log_level)
static LogLevel log_threshold = LogLevel::INFO;
#ifdef HAVE_GLIB
static const char *log_charset;
#endif
static bool enable_timestamp;
#ifdef HAVE_SYSLOG
@@ -81,16 +73,6 @@ SetLogThreshold(LogLevel _threshold)
log_threshold = _threshold;
}
#ifdef HAVE_GLIB
void
SetLogCharset(const char *_charset)
{
log_charset = _charset;
}
#endif
void
EnableLogTimestamp()
{
@@ -175,20 +157,6 @@ LogFinishSysLog()
static void
FileLog(const Domain &domain, const char *message)
{
#ifdef HAVE_GLIB
char *converted;
if (log_charset != nullptr) {
converted = g_convert_with_fallback(message, -1,
log_charset, "utf-8",
nullptr, nullptr,
nullptr, nullptr);
if (converted != nullptr)
message = converted;
} else
converted = nullptr;
#endif
fprintf(stderr, "%s%s: %.*s\n",
enable_timestamp ? log_date() : "",
domain.GetName(),
@@ -199,10 +167,6 @@ FileLog(const Domain &domain, const char *message)
to have an effect on WIN32 */
fflush(stderr);
#endif
#ifdef HAVE_GLIB
g_free(converted);
#endif
}
#endif /* !ANDROID */