Enabled g_mem_set_vtable through the configure option --with-overridable-allocators...

[mono.git] / eglib / src / goutput.c

diff --git a/eglib/src/goutput.c b/eglib/src/goutput.c
index d59c4cc8f8342608d5b4669754278ed87243f43a..689493be845202536b599be5f4d646a602ca8db5 100644 (file)
--- a/eglib/src/goutput.c
+++ b/eglib/src/goutput.c
@@ -49,7 +49,7 @@ g_print (const gchar *format, ...)
        va_list args;
 
        va_start (args, format);
-       if (vasprintf (&msg, format, args) < 0)
+       if (g_vasprintf (&msg, format, args) < 0)
                return;
        va_end (args);
 
@@ -57,7 +57,7 @@ g_print (const gchar *format, ...)
                stdout_handler = default_stdout_handler;
 
        stdout_handler (msg);
-       free (msg);
+       g_free (msg);
 }
 
 void
@@ -67,15 +67,15 @@ g_printerr (const gchar *format, ...)
        va_list args;
 
        va_start (args, format);
-       if (vasprintf (&msg, format, args) < 0)
+       if (g_vasprintf (&msg, format, args) < 0)
                return;
        va_end (args);
 
        if (!stderr_handler)
                stderr_handler = default_stderr_handler;
 
-       stdout_handler (msg);
-       free (msg);
+       stderr_handler (msg);
+       g_free (msg);
 }
 
 GLogLevelFlags
@@ -107,11 +107,11 @@ g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format,
        if (!default_log_func)
                default_log_func = g_log_default_handler;
        
-       if (vasprintf (&msg, format, args) < 0)
+       if (g_vasprintf (&msg, format, args) < 0)
                return;
 
        default_log_func (log_domain, log_level, msg, default_log_func_user_data);
-       free (msg);
+       g_free (msg);
 }
 
 void
@@ -132,6 +132,7 @@ g_assertion_message (const gchar *format, ...)
        va_start (args, format);
        g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
        va_end (args);
+       exit (0);
 }
 
 
@@ -156,7 +157,7 @@ to_android_priority (GLogLevelFlags log_level)
 void
 g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
 {
-       __android_log_vprint (to_android_priority (log_level), log_domain, "%s", args);
+       __android_log_write (to_android_priority (log_level), log_domain, message);
        if (log_level & fatal)
                abort ();
 }
@@ -165,18 +166,18 @@ static void
 default_stdout_handler (const gchar *message)
 {
        /* TODO: provide a proper app name */
-       __android_log_vprint (ANDROID_LOG_ERROR, "mono", "%s", message);
+       __android_log_write (ANDROID_LOG_ERROR, "mono", message);
 }
 
 static void
 default_stderr_handler (const gchar *message)
 {
        /* TODO: provide a proper app name */
-       __android_log_vprint (ANDROID_LOG_ERROR, "mono", "%s", message);
+       __android_log_write (ANDROID_LOG_ERROR, "mono", message);
 }
 
 
-#elif MONOTOUCH
+#elif defined(HOST_IOS)
 #include <asl.h>
 
 static int
@@ -197,7 +198,7 @@ to_asl_priority (GLogLevelFlags log_level)
 void
 g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
 {
-       asl_vlog (NULL, NULL, to_asl_priority (log_level), "%s", message);
+       asl_log (NULL, NULL, to_asl_priority (log_level), "%s", message);
        if (log_level & fatal)
                abort ();
 }
@@ -205,13 +206,13 @@ g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const
 static void
 default_stdout_handler (const gchar *message)
 {
-       asl_vlog (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
+       asl_log (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
 }
 
 static void
 default_stderr_handler (const gchar *message)
 {
-       asl_vlog (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
+       asl_log (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
 }
 
 #else
@@ -268,7 +269,7 @@ GPrintFunc
 g_set_printerr_handler (GPrintFunc func)
 {
        GPrintFunc old = stderr_handler;
-       stdout_handler = func;
+       stderr_handler = func;
        return old;
 }