crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logging: remove semaphore usage since libnfc is not threaded and log4c does handle threaded cases itself. (Should ease Windows compiling)

Browse source
This commit is contained in:
Romuald Conty 2011-09-20 14:07:40 +00:00
parent c4b45cd390
commit ca8bd1df91
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,5 @@
------------------------------- -------------------------------
Apr nn, 2011 - 1.5.0 (unstable) Apr 29, 2011 - 1.5.0 (unstable)
------------------------------- -------------------------------
Fixes: Fixes:

14
libnfc/log.c
View file

@ -19,22 +19,14 @@
#include <fcntl.h> #include <fcntl.h>
#include <log4c.h> #include <log4c.h>
#include <semaphore.h>
#include "log.h" #include "log.h"
sem_t *__log_sem;
const char *__sem_name = "/libnfc";
static uint8_t __log_init_counter = 0; static uint8_t __log_init_counter = 0;
int int
log_init (void) log_init (void)
{ {
if ((__log_sem = sem_open (__sem_name, O_CREAT, 0666, 1)) == SEM_FAILED) {
perror ("sem_open");
return -1;
}
int res = 0; int res = 0;
if (__log_init_counter == 0) { if (__log_init_counter == 0) {
@ -52,8 +44,6 @@ log_fini (void)
int res = 0; int res = 0;
if (__log_init_counter >= 1) { if (__log_init_counter >= 1) {
if (__log_init_counter == 1) { if (__log_init_counter == 1) {
sem_close (__log_sem);
sem_unlink (__sem_name);
res = log4c_fini (); res = log4c_fini ();
} }
__log_init_counter--; __log_init_counter--;
@ -66,14 +56,10 @@ log_fini (void)
void void
log_put (char *category, int priority, char *format, ...) log_put (char *category, int priority, char *format, ...)
{ {
sem_wait (__log_sem);
const log4c_category_t *cat = log4c_category_get (category); const log4c_category_t *cat = log4c_category_get (category);
if (log4c_category_is_priority_enabled (cat, priority)) { if (log4c_category_is_priority_enabled (cat, priority)) {
va_list va; va_list va;
va_start (va, format); va_start (va, format);
log4c_category_vlog (cat, priority, format, va); log4c_category_vlog (cat, priority, format, va);
} }
sem_post (__log_sem);
} }