From 24eebd6bf7de9ee31b1056ebb1f957c0f820ab3e Mon Sep 17 00:00:00 2001 From: Stefano Miccoli Date: Sun, 24 Aug 2014 00:51:06 +0200 Subject: [PATCH] corrected unitialized global Mutex.aliaslist_mutex and delete unused members --- module/owlib/src/c/error.c | 2 +- module/owlib/src/c/ow_locks.c | 9 +++++---- module/owlib/src/include/ow_mutexes.h | 10 ++-------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/module/owlib/src/c/error.c b/module/owlib/src/c/error.c index 64f6e7a..4fd4d4e 100644 --- a/module/owlib/src/c/error.c +++ b/module/owlib/src/c/error.c @@ -187,7 +187,7 @@ void fatal_error(const char * file, int line, const char * func, const char *fmt #else vsprintf(buf, fmt, ap); #endif - fprintf(stderr, buf); + fprintf(stderr, "%s", buf); } #else /* OWNETC_OW_DEBUG */ if(Globals.fatal_debug) { diff --git a/module/owlib/src/c/ow_locks.c b/module/owlib/src/c/ow_locks.c index aba49d7..176f10b 100644 --- a/module/owlib/src/c/ow_locks.c +++ b/module/owlib/src/c/ow_locks.c @@ -35,6 +35,7 @@ void LockSetup(void) { /* global mutex attribute */ _MUTEX_ATTR_INIT(Mutex.mattr); + #ifdef __UCLIBC__ #if ((__UCLIBC_MAJOR__ << 16)+(__UCLIBC_MINOR__ << 8)+(__UCLIBC_SUBLEVEL__) < 0x00091D) /* If uClibc < 0.9.29, then re-initialize internal pthread-structs @@ -60,10 +61,13 @@ void LockSetup(void) _MUTEX_INIT(Mutex.controlflags_mutex); _MUTEX_INIT(Mutex.fstat_mutex); _MUTEX_INIT(Mutex.dir_mutex); + #if OW_USB + _MUTEX_INIT(Mutex.libusb_mutex); + #endif /* OW_USB */ _MUTEX_INIT(Mutex.typedir_mutex); _MUTEX_INIT(Mutex.externaldir_mutex); _MUTEX_INIT(Mutex.namefind_mutex); - _MUTEX_INIT(Mutex.aliasfind_mutex); + _MUTEX_INIT(Mutex.aliaslist_mutex); _MUTEX_INIT(Mutex.externalcount_mutex); _MUTEX_INIT(Mutex.timegm_mutex); _MUTEX_INIT(Mutex.detail_mutex); @@ -73,7 +77,4 @@ void LockSetup(void) RWLOCK_INIT(Mutex.persistent_cache); RWLOCK_INIT(Inbound_Control.lock); RWLOCK_INIT(Inbound_Control.monitor_lock); - #if OW_USB - _MUTEX_INIT(Mutex.libusb_mutex); - #endif /* OW_USB */ } diff --git a/module/owlib/src/include/ow_mutexes.h b/module/owlib/src/include/ow_mutexes.h index 7488a92..7d733a0 100644 --- a/module/owlib/src/include/ow_mutexes.h +++ b/module/owlib/src/include/ow_mutexes.h @@ -58,13 +58,13 @@ extern struct mutexes { pthread_mutex_t stat_mutex; pthread_mutex_t controlflags_mutex; pthread_mutex_t fstat_mutex; - pthread_mutex_t simul_mutex; pthread_mutex_t dir_mutex; + #if OW_USB pthread_mutex_t libusb_mutex; + #endif /* OW_USB */ pthread_mutex_t typedir_mutex; pthread_mutex_t externaldir_mutex; pthread_mutex_t namefind_mutex; - pthread_mutex_t aliasfind_mutex; pthread_mutex_t aliaslist_mutex; pthread_mutex_t externalcount_mutex; pthread_mutex_t timegm_mutex; @@ -136,9 +136,6 @@ extern struct mutexes { #define FSTATLOCK _MUTEX_LOCK( Mutex.fstat_mutex ) #define FSTATUNLOCK _MUTEX_UNLOCK(Mutex.fstat_mutex ) -#define SIMULLOCK _MUTEX_LOCK( Mutex.simul_mutex ) -#define SIMULUNLOCK _MUTEX_UNLOCK(Mutex.simul_mutex ) - #define DIRLOCK _MUTEX_LOCK( Mutex.dir_mutex ) #define DIRUNLOCK _MUTEX_UNLOCK(Mutex.dir_mutex ) @@ -154,9 +151,6 @@ extern struct mutexes { #define NAMEFINDLOCK _MUTEX_LOCK( Mutex.namefind_mutex) #define NAMEFINDUNLOCK _MUTEX_UNLOCK(Mutex.namefind_mutex) -#define ALIASFINDLOCK _MUTEX_LOCK( Mutex.aliasfind_mutex) -#define ALIASFINDUNLOCK _MUTEX_UNLOCK(Mutex.aliasfind_mutex) - #define ALIASLISTLOCK _MUTEX_LOCK( Mutex.aliaslist_mutex) #define ALIASLISTUNLOCK _MUTEX_UNLOCK(Mutex.aliaslist_mutex) -- 1.7.10.4