diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-06-09 16:54:54 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-06-09 16:54:54 +0000 |
| commit | aeb27a107c5980edbd2c72db435e25551ca9bd3f (patch) | |
| tree | d1363f15b3594383ebfdf75551c90fac7c2786f3 | |
| parent | 59d406b8a64c706096879193767870b62dd78ac4 (diff) | |
| download | lasso-aeb27a107c5980edbd2c72db435e25551ca9bd3f.tar.gz lasso-aeb27a107c5980edbd2c72db435e25551ca9bd3f.tar.xz lasso-aeb27a107c5980edbd2c72db435e25551ca9bd3f.zip | |
Core: in xml error message handler, escape messages to fit on one line
| -rw-r--r-- | lasso/xml/tools.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index 8f0aa8a4..e2898e96 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -1656,18 +1656,27 @@ cleanup: return rc; } +static void xml_logv(int log_level, const char *msg, va_list arg_ptr) { + char buffer[512], *escaped; + + vsnprintf(buffer, 512, msg, arg_ptr); + escaped = g_strescape(buffer, NULL); + g_log("Lasso", log_level, "libxml2: %s", escaped); + lasso_release_string(escaped); +} + static void __xmlWarningFunc(G_GNUC_UNUSED void *userData, const char *msg, ...) { va_list arg_ptr; va_start(arg_ptr, msg); - g_logv("Lasso", G_LOG_LEVEL_WARNING, msg, arg_ptr); + xml_logv(G_LOG_LEVEL_WARNING, msg, arg_ptr); } static void __xmlErrorFunc(G_GNUC_UNUSED void *userData, const char *msg, ...) { va_list arg_ptr; va_start(arg_ptr, msg); - g_logv("Lasso", G_LOG_LEVEL_CRITICAL, msg, arg_ptr); + xml_logv(G_LOG_LEVEL_CRITICAL, msg, arg_ptr); } /** |