Removed unsafe pointer typedefs

- If a variable doesn't look like a pointer... Maybe it might be a
  pointer after all. Please, give me back my '*' sign.
- See CERT DCL05-C.

Signed-off-by: Haru <haru@dotalux.com>

10 files changed, 116 insertions, 116 deletions

diff --git a/src/common/console.h b/src/common/console.h
index d2c58f978..55a9a767c 100644
--- a/src/common/console.h
+++ b/src/common/console.h
@@ -53,10 +53,10 @@ struct {
 struct console_input_interface {
 	/* vars */
 	SPIN_LOCK ptlock;/* parse thread lock */
-	rAthread pthread;/* parse thread */
+	rAthread *pthread;/* parse thread */
 	volatile int32 ptstate;/* parse thread state */
-	ramutex ptmutex;/* parse thread mutex */
-	racond ptcond;/* parse thread cond */
+	ramutex *ptmutex;/* parse thread mutex */
+	racond *ptcond;/* parse thread cond */
 	/* */
 	struct CParseEntry **cmd_list;
 	struct CParseEntry **cmds;
diff --git a/src/common/db.c b/src/common/db.c
index 79e55023f..cf22d8245 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -145,7 +145,7 @@ typedef struct dbn {
 	// Other
 	node_color color;
 	unsigned deleted : 1;
-} *DBNode;
+} DBNode;
 
 /**
  * Structure that holds a deleted node.
@@ -155,8 +155,8 @@ typedef struct dbn {
  * @see DBMap_impl#free_list
  */
 struct db_free {
-	DBNode node;
-	DBNode *root;
+	DBNode *node;
+	DBNode **root;
 };
 
 /**
@@ -193,12 +193,12 @@ typedef struct DBMap_impl {
 	unsigned int free_max;
 	unsigned int free_lock;
 	// Other
-	ERS nodes;
+	ERS *nodes;
 	DBComparator cmp;
 	DBHasher hash;
 	DBReleaser release;
-	DBNode ht[HASH_SIZE];
-	DBNode cache;
+	DBNode *ht[HASH_SIZE];
+	DBNode *cache;
 	DBType type;
 	DBOptions options;
 	uint32 item_count;
@@ -222,7 +222,7 @@ typedef struct DBIterator_impl {
 	struct DBIterator vtable;
 	DBMap_impl* db;
 	int ht_index;
-	DBNode node;
+	DBNode *node;
 } DBIterator_impl;
 
 #if defined(DB_ENABLE_STATS)
@@ -361,12 +361,12 @@ struct eri *db_alloc_ers;
  * @param node Node to be rotated
  * @param root Pointer to the root of the tree
  * @private
- * @see #db_rebalance(DBNode,DBNode *)
- * @see #db_rebalance_erase(DBNode,DBNode *)
+ * @see #db_rebalance(DBNode *,DBNode **)
+ * @see #db_rebalance_erase(DBNode *,DBNode **)
  */
-static void db_rotate_left(DBNode node, DBNode *root)
+static void db_rotate_left(DBNode *node, DBNode **root)
 {
-	DBNode y = node->right;
+	DBNode *y = node->right;
 
 	DB_COUNTSTAT(db_rotate_left);
 	// put the left of y at the right of node
@@ -392,12 +392,12 @@ static void db_rotate_left(DBNode node, DBNode *root)
  * @param node Node to be rotated
  * @param root Pointer to the root of the tree
  * @private
- * @see #db_rebalance(DBNode,DBNode *)
- * @see #db_rebalance_erase(DBNode,DBNode *)
+ * @see #db_rebalance(DBNode *,DBNode **)
+ * @see #db_rebalance_erase(DBNode *,DBNode **)
  */
-static void db_rotate_right(DBNode node, DBNode *root)
+static void db_rotate_right(DBNode *node, DBNode **root)
 {
-	DBNode y = node->left;
+	DBNode *y = node->left;
 
 	DB_COUNTSTAT(db_rotate_right);
 	// put the right of y at the left of node
@@ -424,13 +424,13 @@ static void db_rotate_right(DBNode node, DBNode *root)
  * @param node Node to be rebalanced
  * @param root Pointer to the root of the tree
  * @private
- * @see #db_rotate_left(DBNode,DBNode *)
- * @see #db_rotate_right(DBNode,DBNode *)
+ * @see #db_rotate_left(DBNode *,DBNode **)
+ * @see #db_rotate_right(DBNode *,DBNode **)
  * @see #db_obj_put(DBMap*,DBKey,DBData)
  */
-static void db_rebalance(DBNode node, DBNode *root)
+static void db_rebalance(DBNode *node, DBNode **root)
 {
-	DBNode y;
+	DBNode *y;
 
 	DB_COUNTSTAT(db_rebalance);
 	// Restore the RED-BLACK properties
@@ -486,16 +486,16 @@ static void db_rebalance(DBNode node, DBNode *root)
  * @param node Node to be erased from the tree
  * @param root Root of the tree
  * @private
- * @see #db_rotate_left(DBNode,DBNode *)
- * @see #db_rotate_right(DBNode,DBNode *)
+ * @see #db_rotate_left(DBNode *,DBNode **)
+ * @see #db_rotate_right(DBNode *,DBNode **)
  * @see #db_free_unlock(DBMap_impl*)
  */
-static void db_rebalance_erase(DBNode node, DBNode *root)
+static void db_rebalance_erase(DBNode *node, DBNode **root)
 {
-	DBNode y = node;
-	DBNode x = NULL;
-	DBNode x_parent = NULL;
-	DBNode w;
+	DBNode *y = node;
+	DBNode *x = NULL;
+	DBNode *x_parent = NULL;
+	DBNode *w;
 
 	DB_COUNTSTAT(db_rebalance_erase);
 	// Select where to change the tree
@@ -650,8 +650,8 @@ static int db_is_key_null(DBType type, DBKey key)
  * @param key Key to be duplicated
  * @param Duplicated key
  * @private
- * @see #db_free_add(DBMap_impl*,DBNode,DBNode *)
- * @see #db_free_remove(DBMap_impl*,DBNode)
+ * @see #db_free_add(DBMap_impl*,DBNode *,DBNode **)
+ * @see #db_free_remove(DBMap_impl*,DBNode *)
  * @see #db_obj_put(DBMap*,DBKey,void *)
  * @see #db_dup_key_free(DBMap_impl*,DBKey)
  */
@@ -710,9 +710,9 @@ static void db_dup_key_free(DBMap_impl* db, DBKey key)
  * @see DBMap_impl#free_count
  * @see DBMap_impl#free_max
  * @see #db_obj_remove(DBMap*,DBKey)
- * @see #db_free_remove(DBMap_impl*,DBNode)
+ * @see #db_free_remove(DBMap_impl*,DBNode *)
  */
-static void db_free_add(DBMap_impl* db, DBNode node, DBNode *root)
+static void db_free_add(DBMap_impl* db, DBNode *node, DBNode **root)
 {
 	DBKey old_key;
 
@@ -759,9 +759,9 @@ static void db_free_add(DBMap_impl* db, DBNode node, DBNode *root)
  * @see DBMap_impl#free_list
  * @see DBMap_impl#free_count
  * @see #db_obj_put(DBMap*,DBKey,DBData)
- * @see #db_free_add(DBMap_impl*,DBNode*,DBNode)
+ * @see #db_free_add(DBMap_impl*,DBNode**,DBNode*)
  */
-static void db_free_remove(DBMap_impl* db, DBNode node)
+static void db_free_remove(DBMap_impl* db, DBNode *node)
 {
 	unsigned int i;
 
@@ -810,7 +810,7 @@ static void db_free_lock(DBMap_impl* db)
  * @param db Target database
  * @private
  * @see DBMap_impl#free_lock
- * @see #db_free_dbn(DBNode)
+ * @see #db_free_dbn(DBNode*)
  * @see #db_lock(DBMap_impl*)
  */
 static void db_free_unlock(DBMap_impl* db)
@@ -1267,8 +1267,8 @@ DBData* dbit_obj_last(DBIterator* self, DBKey* out_key)
 DBData* dbit_obj_next(DBIterator* self, DBKey* out_key)
 {
 	DBIterator_impl* it = (DBIterator_impl*)self;
-	DBNode node;
-	DBNode parent;
+	DBNode *node;
+	DBNode *parent;
 	struct dbn fake;
 
 	DB_COUNTSTAT(dbit_next);
@@ -1343,8 +1343,8 @@ DBData* dbit_obj_next(DBIterator* self, DBKey* out_key)
 DBData* dbit_obj_prev(DBIterator* self, DBKey* out_key)
 {
 	DBIterator_impl* it = (DBIterator_impl*)self;
-	DBNode node;
-	DBNode parent;
+	DBNode *node;
+	DBNode *parent;
 	struct dbn fake;
 
 	DB_COUNTSTAT(dbit_prev);
@@ -1439,7 +1439,7 @@ bool dbit_obj_exists(DBIterator* self)
 int dbit_obj_remove(DBIterator* self, DBData *out_data)
 {
 	DBIterator_impl* it = (DBIterator_impl*)self;
-	DBNode node;
+	DBNode *node;
 	int retval = 0;
 
 	DB_COUNTSTAT(dbit_remove);
@@ -1518,7 +1518,7 @@ static DBIterator* db_obj_iterator(DBMap* self)
 static bool db_obj_exists(DBMap* self, DBKey key)
 {
 	DBMap_impl* db = (DBMap_impl*)self;
-	DBNode node;
+	DBNode *node;
 	int c;
 	bool found = false;
 
@@ -1569,7 +1569,7 @@ static bool db_obj_exists(DBMap* self, DBKey key)
 static DBData* db_obj_get(DBMap* self, DBKey key)
 {
 	DBMap_impl* db = (DBMap_impl*)self;
-	DBNode node;
+	DBNode *node;
 	int c;
 	DBData *data = NULL;
 
@@ -1630,8 +1630,8 @@ static unsigned int db_obj_vgetall(DBMap* self, DBData **buf, unsigned int max,
 {
 	DBMap_impl* db = (DBMap_impl*)self;
 	unsigned int i;
-	DBNode node;
-	DBNode parent;
+	DBNode *node;
+	DBNode *parent;
 	unsigned int ret = 0;
 
 	DB_COUNTSTAT(db_vgetall);
@@ -1727,8 +1727,8 @@ static unsigned int db_obj_getall(DBMap* self, DBData **buf, unsigned int max, D
 static DBData* db_obj_vensure(DBMap* self, DBKey key, DBCreateData create, va_list args)
 {
 	DBMap_impl* db = (DBMap_impl*)self;
-	DBNode node;
-	DBNode parent = NULL;
+	DBNode *node;
+	DBNode *parent = NULL;
 	unsigned int hash;
 	int c = 0;
 	DBData *data = NULL;
@@ -1856,8 +1856,8 @@ static DBData* db_obj_ensure(DBMap* self, DBKey key, DBCreateData create, ...)
 static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data)
 {
 	DBMap_impl* db = (DBMap_impl*)self;
-	DBNode node;
-	DBNode parent = NULL;
+	DBNode *node;
+	DBNode *parent = NULL;
 	int c = 0, retval = 0;
 	unsigned int hash;
 
@@ -1949,19 +1949,19 @@ static int db_obj_put(DBMap* self, DBKey key, DBData data, DBData *out_data)
 /**
  * Remove an entry from the database.
  * Puts the previous data in out_data, if out_data is not NULL.
- * NOTE: The key (of the database) is released in {@link #db_free_add(DBMap_impl*,DBNode,DBNode *)}.
+ * NOTE: The key (of the database) is released in {@link #db_free_add(DBMap_impl*,DBNode*,DBNode **)}.
  * @param self Interface of the database
  * @param key Key that identifies the entry
  * @param out_data Previous data if the entry exists
  * @return 1 if if the entry already exists, 0 otherwise
  * @protected
- * @see #db_free_add(DBMap_impl*,DBNode,DBNode *)
+ * @see #db_free_add(DBMap_impl*,DBNode*,DBNode **)
  * @see DBMap#remove
  */
 static int db_obj_remove(DBMap* self, DBKey key, DBData *out_data)
 {
 	DBMap_impl* db = (DBMap_impl*)self;
-	DBNode node;
+	DBNode *node;
 	unsigned int hash;
 	int c = 0, retval = 0;
 
@@ -2018,8 +2018,8 @@ static int db_obj_vforeach(DBMap* self, DBApply func, va_list args)
 	DBMap_impl* db = (DBMap_impl*)self;
 	unsigned int i;
 	int sum = 0;
-	DBNode node;
-	DBNode parent;
+	DBNode *node;
+	DBNode *parent;
 
 	DB_COUNTSTAT(db_vforeach);
 	if (db == NULL) return 0; // nullpo candidate
@@ -2104,8 +2104,8 @@ static int db_obj_vclear(DBMap* self, DBApply func, va_list args)
 	DBMap_impl* db = (DBMap_impl*)self;
 	int sum = 0;
 	unsigned int i;
-	DBNode node;
-	DBNode parent;
+	DBNode *node;
+	DBNode *parent;
 
 	DB_COUNTSTAT(db_vclear);
 	if (db == NULL) return 0; // nullpo candidate
diff --git a/src/common/ers.c b/src/common/ers.c
index 0842d9e15..c8a11d2a9 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -185,7 +185,7 @@ static void ers_free_cache(ers_cache_t *cache, bool remove)
 	aFree(cache);
 }
 
-static void *ers_obj_alloc_entry(ERS self)
+static void *ers_obj_alloc_entry(ERS *self)
 {
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 	void *ret;
@@ -225,7 +225,7 @@ static void *ers_obj_alloc_entry(ERS self)
 	return ret;
 }
 
-static void ers_obj_free_entry(ERS self, void *entry)
+static void ers_obj_free_entry(ERS *self, void *entry)
 {
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 	struct ers_list *reuse = (struct ers_list *)((unsigned char *)entry - sizeof(struct ers_list));
@@ -247,7 +247,7 @@ static void ers_obj_free_entry(ERS self, void *entry)
 	instance->Cache->UsedObjs--;
 }
 
-static size_t ers_obj_entry_size(ERS self)
+static size_t ers_obj_entry_size(ERS *self)
 {
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 
@@ -259,7 +259,7 @@ static size_t ers_obj_entry_size(ERS self)
 	return instance->Cache->ObjectSize;
 }
 
-static void ers_obj_destroy(ERS self)
+static void ers_obj_destroy(ERS *self)
 {
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 
@@ -289,7 +289,7 @@ static void ers_obj_destroy(ERS self)
 	aFree(instance);
 }
 
-void ers_cache_size(ERS self, unsigned int new_size) {
+void ers_cache_size(ERS *self, unsigned int new_size) {
 	struct ers_instance_t *instance = (struct ers_instance_t *)self;
 	
 	nullpo_retv(instance);
@@ -302,7 +302,7 @@ void ers_cache_size(ERS self, unsigned int new_size) {
 }
 
 
-ERS ers_new(uint32 size, char *name, enum ERSOptions options)
+ERS *ers_new(uint32 size, char *name, enum ERSOptions options)
 {
 	struct ers_instance_t *instance;
 	CREATE(instance,struct ers_instance_t, 1);
@@ -387,7 +387,7 @@ void ers_final(void) {
 	
 	while( instance ) {
 		next = instance->Next;
-		ers_obj_destroy((ERS)instance);
+		ers_obj_destroy((ERS*)instance);
 		instance = next;
 	}
 }
diff --git a/src/common/ers.h b/src/common/ers.h
index f32680339..e11f7f37e 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -126,7 +126,7 @@ typedef struct eri {
 
 	/* */
 	void (*chunk_size) (struct eri *self, unsigned int new_size);
-} *ERS;
+} ERS;
 
 #ifdef DISABLE_ERS
 // Use memory manager to allocate/free and disable other interface functions
@@ -158,7 +158,7 @@ typedef struct eri {
  * @param The requested size of the entry in bytes
  * @return Interface of the object
  */
-ERS ers_new(uint32 size, char *name, enum ERSOptions options);
+ERS *ers_new(uint32 size, char *name, enum ERSOptions options);
 
 /**
  * Print a report about the current state of the Entry Reusage System.
diff --git a/src/common/mutex.c b/src/common/mutex.c
index 626dfa2e1..6707df7e6 100644
--- a/src/common/mutex.c
+++ b/src/common/mutex.c
@@ -50,7 +50,7 @@ struct racond{
 //
 
 
-ramutex ramutex_create(){
+ramutex *ramutex_create() {
 	struct ramutex *m;
 	
 	m = (struct ramutex*)aMalloc( sizeof(struct ramutex) );
@@ -69,7 +69,7 @@ ramutex ramutex_create(){
 }//end: ramutex_create()
 
 
-void ramutex_destroy( ramutex m ){
+void ramutex_destroy(ramutex *m) {
 
 #ifdef WIN32
 	DeleteCriticalSection(&m->hMutex);
@@ -82,7 +82,7 @@ void ramutex_destroy( ramutex m ){
 }//end: ramutex_destroy()
 
 
-void ramutex_lock( ramutex m ){
+void ramutex_lock(ramutex *m) {
 
 #ifdef WIN32
 	EnterCriticalSection(&m->hMutex);
@@ -92,7 +92,7 @@ void ramutex_lock( ramutex m ){
 }//end: ramutex_lock
 
 
-bool ramutex_trylock( ramutex m ){
+bool ramutex_trylock(ramutex *m) {
 #ifdef WIN32
 	if(TryEnterCriticalSection(&m->hMutex) == TRUE)
 		return true;
@@ -107,7 +107,7 @@ bool ramutex_trylock( ramutex m ){
 }//end: ramutex_trylock()
 
 
-void ramutex_unlock( ramutex m ){
+void ramutex_unlock(ramutex *m) {
 #ifdef WIN32
 	LeaveCriticalSection(&m->hMutex);
 #else
@@ -124,7 +124,7 @@ void ramutex_unlock( ramutex m ){
 // Implementation:
 //
 
-racond racond_create(){
+racond *racond_create() {
 	struct racond *c;
 	
 	c = (struct racond*)aMalloc( sizeof(struct racond) );
@@ -146,7 +146,7 @@ racond racond_create(){
 }//end: racond_create()
 
 
-void racond_destroy( racond c ){
+void racond_destroy(racond *c) {
 #ifdef WIN32
 	CloseHandle( c->events[ EVENT_COND_SIGNAL ] );
 	CloseHandle( c->events[ EVENT_COND_BROADCAST ] );
@@ -159,7 +159,7 @@ void racond_destroy( racond c ){
 }//end: racond_destroy()
 
 
-void racond_wait( racond c,  ramutex m,  sysint timeout_ticks){
+void racond_wait(racond *c, ramutex *m, sysint timeout_ticks) {
 #ifdef WIN32
 	register DWORD ms;
 	int result;
@@ -217,7 +217,7 @@ void racond_wait( racond c,  ramutex m,  sysint timeout_ticks){
 }//end: racond_wait()
 
 
-void racond_signal( racond c ){
+void racond_signal(racond *c) {
 #ifdef WIN32
 //	bool has_waiters = false;
 //	EnterCriticalSection(&c->waiters_lock);
@@ -233,7 +233,7 @@ void racond_signal( racond c ){
 }//end: racond_signal()
 
 
-void racond_broadcast( racond c ){
+void racond_broadcast(racond *c) {
 #ifdef WIN32
 //	bool has_waiters = false;
 //	EnterCriticalSection(&c->waiters_lock);
diff --git a/src/common/mutex.h b/src/common/mutex.h
index ce13a28b7..ced91ab8e 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -6,29 +6,29 @@
 
 #include "../common/cbasetypes.h"
 
-typedef struct ramutex *ramutex; // Mutex
-typedef struct racond *racond; // Condition Var
+typedef struct ramutex ramutex; // Mutex
+typedef struct racond racond; // Condition Var
 
 /**
  * Creates a Mutex
  *
  * @return not NULL
  */
-ramutex ramutex_create();
+ramutex *ramutex_create();
 
 /**
  * Destroys a Mutex
  *
  * @param m - the mutex to destroy
  */
-void ramutex_destroy( ramutex m );
+void ramutex_destroy(ramutex *m);
 
 /**
  * Gets a lock
  *
  * @param m - the mutex to lock
  */
-void ramutex_lock( ramutex m);
+void ramutex_lock(ramutex *m);
 
 /**
  * Trys to get the Lock
@@ -37,14 +37,14 @@ void ramutex_lock( ramutex m);
  *
  * @return boolean (true = got the lock)
  */
-bool ramutex_trylock( ramutex m );
+bool ramutex_trylock(ramutex *m);
 
 /**
  * Unlocks a mutex
  *
  * @param m - the mutex to unlock
  */
-void ramutex_unlock( ramutex m);
+void ramutex_unlock(ramutex *m);
 
 
 /**
@@ -52,14 +52,14 @@ void ramutex_unlock( ramutex m);
  *
  * @return not NULL
  */
-racond racond_create();
+racond *racond_create();
 
 /**
  * Destroy a Condition variable
  *
  * @param c - the condition variable to destroy
  */
-void racond_destroy( racond c );
+void racond_destroy(racond *c);
 
 /**
  * Waits Until state is signaled
@@ -68,7 +68,7 @@ void racond_destroy( racond c );
  * @param m - the mutex used for synchronization
  * @param timeout_ticks - timeout in ticks ( -1 = INFINITE )
  */
-void racond_wait( racond c,  ramutex m,  sysint timeout_ticks);
+void racond_wait(racond *c, ramutex *m, sysint timeout_ticks);
 
 /**
  * Sets the given condition var to signaled state
@@ -78,7 +78,7 @@ void racond_wait( racond c,  ramutex m,  sysint timeout_ticks);
  * @note:
  *  Only one waiter gets notified.
  */
-void racond_signal( racond c );
+void racond_signal(racond *c);
 
 /**
  * Sets notifies all waiting threads thats signaled.
@@ -87,7 +87,7 @@ void racond_signal( racond c );
  * @note:
  *  All Waiters getting notified.
  */
-void racond_broadcast( racond c );
+void racond_broadcast(racond *c);
 
 
 #endif /* _COMMON_MUTEX_H_ */
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index fe0da6669..5d57c6462 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -28,25 +28,25 @@ typedef struct __declspec( align(64) ) SPIN_LOCK{
 	volatile LONG lock;
 	volatile LONG nest;
 	volatile LONG sync_lock;
-}  SPIN_LOCK, *PSPIN_LOCK;
+}  SPIN_LOCK;
 #else
 typedef struct SPIN_LOCK{
 		volatile int32 lock;
 		volatile int32 nest; // nesting level.
 		
 		volatile int32 sync_lock;
-} __attribute__((aligned(64))) SPIN_LOCK, *PSPIN_LOCK;
+} __attribute__((aligned(64))) SPIN_LOCK;
 #endif
 
 
 
-static forceinline void InitializeSpinLock(PSPIN_LOCK lck){
+static forceinline void InitializeSpinLock(SPIN_LOCK *lck){
 		lck->lock = 0;
 		lck->nest = 0;
 		lck->sync_lock = 0;
 }
 
-static forceinline void FinalizeSpinLock(PSPIN_LOCK lck){
+static forceinline void FinalizeSpinLock(SPIN_LOCK *lck){
 		return;
 }
 
@@ -54,7 +54,7 @@ static forceinline void FinalizeSpinLock(PSPIN_LOCK lck){
 #define getsynclock(l) do { if(InterlockedCompareExchange((l), 1, 0) == 0) break; rathread_yield(); } while(/*always*/1)
 #define dropsynclock(l) do { InterlockedExchange((l), 0); } while(0)
 
-static forceinline void EnterSpinLock(PSPIN_LOCK lck){
+static forceinline void EnterSpinLock(SPIN_LOCK *lck){
 		int tid = rathread_get_tid();
 		
 		// Get Sync Lock && Check if the requester thread already owns the lock.
@@ -84,7 +84,7 @@ static forceinline void EnterSpinLock(PSPIN_LOCK lck){
 }
 
 
-static forceinline void LeaveSpinLock(PSPIN_LOCK lck){
+static forceinline void LeaveSpinLock(SPIN_LOCK *lck){
 		int tid = rathread_get_tid();
 
 		getsynclock(&lck->sync_lock);
diff --git a/src/common/thread.c b/src/common/thread.c
index 933ee2c0e..d8e0dbf0a 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -98,7 +98,7 @@ void rathread_final(){
 
 
 // gets called whenever a thread terminated ..
-static void rat_thread_terminated(rAthread handle) {
+static void rat_thread_terminated(rAthread *handle) {
 	// Preserve handle->myID and handle->hThread, set everything else to its default value
 	handle->param = NULL;
 	handle->proc = NULL;
@@ -115,7 +115,7 @@ static void *_raThreadMainRedirector( void *p ){
 	
 	// Update myID @ TLS to right id.
 #ifdef HAS_TLS
-	g_rathread_ID = ((rAthread)p)->myID;
+	g_rathread_ID = ((rAthread*)p)->myID;
 #endif
 
 #ifndef WIN32
@@ -133,13 +133,13 @@ static void *_raThreadMainRedirector( void *p ){
 #endif
 
 
-	ret = ((rAthread)p)->proc( ((rAthread)p)->param ) ;
+	ret = ((rAthread*)p)->proc( ((rAthread*)p)->param ) ;
 
 #ifdef WIN32
-	CloseHandle( ((rAthread)p)->hThread );
+	CloseHandle( ((rAthread*)p)->hThread );
 #endif
 
-	rat_thread_terminated( (rAthread)p );
+	rat_thread_terminated( (rAthread*)p );
 #ifdef WIN32
 	return (DWORD)ret;
 #else
@@ -154,18 +154,18 @@ static void *_raThreadMainRedirector( void *p ){
 ///
 /// API Level
 ///
-rAthread rathread_create( rAthreadProc entryPoint,  void *param ){
+rAthread *rathread_create(rAthreadProc entryPoint, void *param) {
 	return rathread_createEx( entryPoint, param,  (1<<23) /*8MB*/,  RAT_PRIO_NORMAL );
 }//end: rathread_create()
 
 
-rAthread rathread_createEx( rAthreadProc entryPoint,  void *param,  size_t szStack,  RATHREAD_PRIO prio ){
+rAthread *rathread_createEx(rAthreadProc entryPoint, void *param, size_t szStack, RATHREAD_PRIO prio) {
 #ifndef WIN32
 	pthread_attr_t attr;
 #endif
 	size_t tmp;
 	unsigned int i;
-	rAthread handle = NULL;
+	rAthread *handle = NULL;
 
 
 	// given stacksize aligned to systems pagesize?
@@ -212,7 +212,7 @@ rAthread rathread_createEx( rAthreadProc entryPoint,  void *param,  size_t szSta
 }//end: rathread_createEx
 
 
-void rathread_destroy ( rAthread handle ){
+void rathread_destroy(rAthread *handle) {
 #ifdef WIN32
 	if( TerminateThread(handle->hThread, 0) != FALSE){
 		CloseHandle(handle->hThread);
@@ -230,9 +230,9 @@ void rathread_destroy ( rAthread handle ){
 #endif
 }//end: rathread_destroy()
 
-rAthread rathread_self( ){
+rAthread *rathread_self() {
 #ifdef HAS_TLS
-	rAthread handle = &l_threads[g_rathread_ID];
+	rAthread *handle = &l_threads[g_rathread_ID];
 	
 	if(handle->proc != NULL) // entry point set, so its used!
 		return handle;
@@ -276,7 +276,7 @@ int rathread_get_tid(){
 }//end: rathread_get_tid()
 
 
-bool rathread_wait( rAthread handle,  void* *out_exitCode ){
+bool rathread_wait(rAthread *handle, void **out_exitCode) {
 	
 	// Hint:
 	// no thread data cleanup routine call here!
@@ -294,13 +294,13 @@ bool rathread_wait( rAthread handle,  void* *out_exitCode ){
 }//end: rathread_wait()
 
 
-void rathread_prio_set( rAthread handle, RATHREAD_PRIO prio ){
+void rathread_prio_set(rAthread *handle, RATHREAD_PRIO prio) {
 	handle->prio = RAT_PRIO_NORMAL;
 	//@TODO
 }//end: rathread_prio_set()
 
 
-RATHREAD_PRIO rathread_prio_get( rAthread handle){
+RATHREAD_PRIO rathread_prio_get(rAthread *handle) {
 	return handle->prio;
 }//end: rathread_prio_get()
 
diff --git a/src/common/thread.h b/src/common/thread.h
index 992e3e6c8..3b5ce7476 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -6,7 +6,7 @@
 
 #include "../common/cbasetypes.h"
 
-typedef struct rAthread *rAthread;
+typedef struct rAthread rAthread;
 typedef void* (*rAthreadProc)(void*);
 
 typedef enum RATHREAD_PRIO {
@@ -24,7 +24,7 @@ typedef enum RATHREAD_PRIO {
  *
  * @return not NULL if success
  */
-rAthread rathread_create( rAthreadProc entryPoint,  void *param );
+rAthread *rathread_create(rAthreadProc entryPoint, void *param);
 
 
 /**
@@ -37,7 +37,7 @@ rAthread rathread_create( rAthreadProc entryPoint,  void *param );
  *
  * @return not NULL if success
  */
-rAthread rathread_createEx( rAthreadProc entryPoint,  void *param,  size_t szStack,  RATHREAD_PRIO prio );
+rAthread *rathread_createEx(rAthreadProc entryPoint, void *param, size_t szStack, RATHREAD_PRIO prio);
 
 
 /**
@@ -47,7 +47,7 @@ rAthread rathread_createEx( rAthreadProc entryPoint,  void *param,  size_t szSta
  *
  * @param handle - thread to destroy.
  */
-void rathread_destroy ( rAthread handle );
+void rathread_destroy(rAthread *handle);
 
 
 /**
@@ -58,7 +58,7 @@ void rathread_destroy ( rAthread handle );
  *
  * @return not NULL if success
  */
-rAthread rathread_self( );
+rAthread *rathread_self();
 
 
 /**
@@ -80,7 +80,7 @@ int rathread_get_tid();
  *
  * @return true - if the given thread has been terminated.
  */
-bool rathread_wait( rAthread handle,  void* *out_exitCode );
+bool rathread_wait(rAthread *handle, void **out_exitCode);
 
 
 /**
@@ -89,7 +89,7 @@ bool rathread_wait( rAthread handle,  void* *out_exitCode );
  * @param handle - thread to set prio for
  * @param rio - the priority (RAT_PRIO_LOW ... )
  */
-void rathread_prio_set( rAthread handle, RATHREAD_PRIO prio );
+void rathread_prio_set(rAthread *handle, RATHREAD_PRIO prio);
 
 
 /**
@@ -97,7 +97,7 @@ void rathread_prio_set( rAthread handle, RATHREAD_PRIO prio );
  *
  * @param handle - the thread to get the prio for.
  */
-RATHREAD_PRIO rathread_prio_get( rAthread handle);
+RATHREAD_PRIO rathread_prio_get(rAthread *handle);
 
 
 /**
diff --git a/src/test/test_spinlock.c b/src/test/test_spinlock.c
index 0c0e3e2ae..2f4c2a5ca 100644
--- a/src/test/test_spinlock.c
+++ b/src/test/test_spinlock.c
@@ -43,7 +43,7 @@ static  void *worker(void *p){
 
 
 int do_init(int argc, char **argv){
-	rAthread t[THRC];
+	rAthread *t[THRC];
 	int j, i;
 	int ok;