From ca8bd1df91a806134c9d59f5d389fecb57b669f6 Mon Sep 17 00:00:00 2001
From: Romuald Conty <romuald@libnfc.org>
Date: Tue, 20 Sep 2011 14:07:40 +0000
Subject: [PATCH] logging: remove semaphore usage since libnfc is not threaded
 and log4c does handle threaded cases itself. (Should ease Windows compiling)

---
 ChangeLog    |  2 +-
 libnfc/log.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3aa81e..8bc80bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 -------------------------------
-Apr nn, 2011 - 1.5.0 (unstable)
+Apr 29, 2011 - 1.5.0 (unstable)
 -------------------------------
 
 Fixes:
diff --git a/libnfc/log.c b/libnfc/log.c
index f4e5db7..5d12136 100644
--- a/libnfc/log.c
+++ b/libnfc/log.c
@@ -19,22 +19,14 @@
 
 #include <fcntl.h>
 #include <log4c.h>
-#include <semaphore.h>
 
 #include "log.h"
 
-sem_t *__log_sem;
-const char *__sem_name = "/libnfc";
-
 static uint8_t __log_init_counter = 0;
 
 int
 log_init (void)
 {
-  if ((__log_sem = sem_open (__sem_name, O_CREAT, 0666, 1)) == SEM_FAILED) {
-    perror ("sem_open");
-    return -1;
-  }
   int res = 0;
 
   if (__log_init_counter == 0) {
@@ -52,8 +44,6 @@ log_fini (void)
   int res = 0;
   if (__log_init_counter >= 1) {
     if (__log_init_counter == 1) {
-      sem_close (__log_sem);
-      sem_unlink (__sem_name);
       res = log4c_fini ();
     }
     __log_init_counter--;
@@ -66,14 +56,10 @@ log_fini (void)
 void
 log_put (char *category, int priority, char *format, ...)
 {
-  sem_wait (__log_sem);
-
   const log4c_category_t *cat = log4c_category_get (category);
   if (log4c_category_is_priority_enabled (cat, priority)) {
     va_list va;
     va_start (va, format);
     log4c_category_vlog (cat, priority, format, va);
   }
-
-  sem_post (__log_sem);
 }