Changes in logging.c [cc305b5:0792d99]

File:

• logging.c (modified) (14 diffs)

logging.c

@@ -1 +1 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
+#include <stdio.h>
 
 typedef struct _owl_log_entry { /* noproto */
@@ -80 +77 @@
 }
 
-char *owl_log_zephyr(const owl_message *m) {
+CALLER_OWN char *owl_log_zephyr(const owl_message *m)
+{
     char *tmp = NULL;
     GString *buffer = NULL;
@@ -103 +101 @@
 }
 
-char *owl_log_aim(const owl_message *m) {
+CALLER_OWN char *owl_log_aim(const owl_message *m)
+{
     GString *buffer = NULL;
     buffer = g_string_new("");
@@ -120 +119 @@
 }
 
-char *owl_log_jabber(const owl_message *m) {
+CALLER_OWN char *owl_log_jabber(const owl_message *m)
+{
     GString *buffer = NULL;
     buffer = g_string_new("");
@@ -132 +132 @@
 }
 
-char *owl_log_generic(const owl_message *m) {
+CALLER_OWN char *owl_log_generic(const owl_message *m)
+{
     GString *buffer;
     buffer = g_string_new("");
@@ -220 +221 @@
     while (cc != NULL) {
       temp = short_zuser(cc->data);
-      filename = g_strdup_printf("%s/%s", logpath, temp);
+      filename = g_build_filename(logpath, temp, NULL);
       owl_log_append(m, filename);
 
@@ -244 +245 @@
   }
 
-  filename = g_strdup_printf("%s/%s", logpath, to);
+  filename = g_build_filename(logpath, to, NULL);
   owl_log_append(m, filename);
   g_free(to);
   g_free(filename);
 
-  filename = g_strdup_printf("%s/all", logpath);
+  filename = g_build_filename(logpath, "all", NULL);
   owl_log_append(m, filename);
   g_free(logpath);
@@ -281 +282 @@
   /* expand ~ in path names */
   logpath = owl_util_makepath(owl_global_get_logpath(&g));
-  filename = g_strdup_printf("%s/%s", logpath, tobuff);
+  filename = g_build_filename(logpath, tobuff, NULL);
   msgbuf = g_string_new("");
   g_string_printf(msgbuf, "ERROR (owl): %s\n%s\n", tobuff, text);
@@ -290 +291 @@
   g_string_free(msgbuf, TRUE);
 
-  filename = g_strdup_printf("%s/all", logpath);
+  filename = g_build_filename(logpath, "all", NULL);
   g_free(logpath);
   msgbuf = g_string_new("");
@@ -389 +390 @@
   if (personal) {
     logpath = owl_util_makepath(owl_global_get_logpath(&g));
-    filename = g_strdup_printf("%s/%s", logpath, from);
-    allfilename = g_strdup_printf("%s/all", logpath);
+    filename = g_build_filename(logpath, from, NULL);
+    allfilename = g_build_filename(logpath, "all", NULL);
     owl_log_append(m, allfilename);
     g_free(allfilename);
   } else {
     logpath = owl_util_makepath(owl_global_get_classlogpath(&g));
-    filename = g_strdup_printf("%s/%s", logpath, from);
+    filename = g_build_filename(logpath, from, NULL);
   }
 
@@ -411 +412 @@
       temp = short_zuser(cc->data);
       if (strcasecmp(temp, frombuff) != 0) {
-        filename = g_strdup_printf("%s/%s", logpath, temp);
+        filename = g_build_filename(logpath, temp, NULL);
         owl_log_append(m, filename);
         g_free(filename);
@@ -428 +429 @@
 static gpointer owl_log_thread_func(gpointer data)
 {
-  log_context = g_main_context_new();
   log_loop = g_main_loop_new(log_context, FALSE);
   g_main_loop_run(log_loop);
@@ -436 +436 @@
 void owl_log_init(void) 
 {
+  log_context = g_main_context_new();
+#if GLIB_CHECK_VERSION(2, 31, 0)
+  logging_thread = g_thread_new("logging",
+                                owl_log_thread_func,
+                                NULL);
+#else
   GError *error = NULL;
   logging_thread = g_thread_create(owl_log_thread_func,
@@ -447 +453 @@
     exit(1);
   }
+#endif
   
 }