From 0c4e68d5afb47b2e378cf782f289c328c05a11d3 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 25 May 2016 22:54:21 +0200
Subject: major cleanup and refactoring

---
 src/log.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'src/log.c')

diff --git a/src/log.c b/src/log.c
index 0d097bb..47e018d 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,4 +1,4 @@
-x/*
+/*
  *  gstdvbbackend
  *
  *  gstdvbbackend is a small programm which captures a given set of dvb
@@ -181,15 +181,14 @@ void log_init()
 {
   stdlog.max_prio_ = 0;
   stdlog.targets_.first_ = NULL;
-  g_thread_init(NULL);
-  stdlog.log_mutex_ = g_mutex_new();
+  g_mutex_init(&(stdlog.log_mutex_));
 }
 
 void log_close()
 {
-  g_mutex_lock(stdlog.log_mutex_);
+  g_mutex_lock(&(stdlog.log_mutex_));
   log_targets_clear(&stdlog.targets_);
-  g_mutex_unlock(stdlog.log_mutex_);
+  g_mutex_unlock(&(stdlog.log_mutex_));
 }
 
 void update_max_prio()
@@ -208,10 +207,10 @@ int log_add_target(const char* conf)
   if(!conf)
     return -1;
 
-  g_mutex_lock(stdlog.log_mutex_);
+  g_mutex_lock(&(stdlog.log_mutex_));
   int ret = log_targets_add(&stdlog.targets_, conf);
   if(!ret) update_max_prio();
-  g_mutex_unlock(stdlog.log_mutex_);
+  g_mutex_unlock(&(stdlog.log_mutex_));
   return ret;
 }
 
@@ -220,34 +219,34 @@ void log_printf(log_prio_t prio, const char* fmt, ...)
   if(stdlog.max_prio_ < prio)
     return;
 
-  char msg[MSG_LENGTH_MAX];
+  static char msg[MSG_LENGTH_MAX];
   va_list args;
 
   va_start(args, fmt);
   vsnprintf(msg, MSG_LENGTH_MAX, fmt, args);
   va_end(args);
 
-  g_mutex_lock(stdlog.log_mutex_);
+  g_mutex_lock(&(stdlog.log_mutex_));
   log_targets_log(&stdlog.targets_, prio, msg);
-  g_mutex_unlock(stdlog.log_mutex_);
+  g_mutex_unlock(&(stdlog.log_mutex_));
 }
 
-void log_print_hex_dump(log_prio_t prio, const uint8_t* buf, uint32_t len)
+void log_print_hex_dump(log_prio_t prio, const u_int8_t* buf, u_int32_t len)
 {
   if(stdlog.max_prio_ < prio)
     return;
 
-  char msg[MSG_LENGTH_MAX];
+  static char msg[MSG_LENGTH_MAX];
 
   if(!buf) {
     snprintf(msg, MSG_LENGTH_MAX, "(NULL)");
   }
   else {
-    uint32_t i;
+    u_int32_t i;
     int offset = snprintf(msg, MSG_LENGTH_MAX, "dump(%d): ", len);
     if(offset < 0)
       return;
-    uint8_t* ptr = &msg[offset];
+    char* ptr = &msg[offset];
 
     for(i=0; i < len; i++) {
       if(((i+1)*3) >= (MSG_LENGTH_MAX - offset))
@@ -256,7 +255,7 @@ void log_print_hex_dump(log_prio_t prio, const uint8_t* buf, uint32_t len)
       ptr+=3;
     }
   }
-  g_mutex_lock(stdlog.log_mutex_);
+  g_mutex_lock(&(stdlog.log_mutex_));
   log_targets_log(&stdlog.targets_, prio, msg);
-  g_mutex_unlock(stdlog.log_mutex_);
+  g_mutex_unlock(&(stdlog.log_mutex_));
 }
-- 
cgit v1.2.3