avoid compiler warnings and stasndardise a few declarations

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39672 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-04-17 15:07:38 +00:00
parent 506824d1fd
commit 2d99b4b95d

View file

@ -409,17 +409,17 @@ static inline NSValue* NSValueCreateFromPthread(pthread_t thread)
* from an NSValue. * from an NSValue.
*/ */
static inline void static inline void
_getPthreadFromNSValue(NSValue* value, pthread_t *thread_ptr) _getPthreadFromNSValue(const void *value, pthread_t *thread_ptr)
{ {
const char *enc; const char *enc;
NSCAssert(thread_ptr, @"No storage for thread reference"); NSCAssert(thread_ptr, @"No storage for thread reference");
# ifndef NS_BLOCK_ASSERTIONS # ifndef NS_BLOCK_ASSERTIONS
enc = [value objCType]; enc = [(NSValue*)value objCType];
NSCAssert(enc != NULL && (0 == strcmp(@encode(pthread_t),enc)), NSCAssert(enc != NULL && (0 == strcmp(@encode(pthread_t),enc)),
@"Invalid NSValue container for thread reference"); @"Invalid NSValue container for thread reference");
# endif # endif
[value getValue: (void*)thread_ptr]; [(NSValue*)value getValue: (void*)thread_ptr];
} }
/** /**
@ -428,8 +428,8 @@ _getPthreadFromNSValue(NSValue* value, pthread_t *thread_ptr)
*/ */
static BOOL static BOOL
_boxedPthreadIsEqual(NSMapTable *t, _boxedPthreadIsEqual(NSMapTable *t,
const void* boxed, const void *boxed,
const void* boxedOther) const void *boxedOther)
{ {
pthread_t thread; pthread_t thread;
pthread_t otherThread; pthread_t otherThread;
@ -454,7 +454,7 @@ _boxedPthreadIsEqual(NSMapTable *t,
* equality), but makes things quite inefficient (linear search over all * equality), but makes things quite inefficient (linear search over all
* elements), so we need to keep the table small. * elements), so we need to keep the table small.
*/ */
static NSUInteger _boxedPthreadHash(NSMapTable* t, const void* value) static NSUInteger _boxedPthreadHash(NSMapTable *t, const void *value)
{ {
return 0; return 0;
} }
@ -462,7 +462,7 @@ static NSUInteger _boxedPthreadHash(NSMapTable* t, const void* value)
/** /**
* Retain callback for boxed thread references. * Retain callback for boxed thread references.
*/ */
static void _boxedPthreadRetain(NSMapTable* t, const void* value) static void _boxedPthreadRetain(NSMapTable *t, const void *value)
{ {
RETAIN((NSValue*)value); RETAIN((NSValue*)value);
} }
@ -470,7 +470,7 @@ static void _boxedPthreadRetain(NSMapTable* t, const void* value)
/** /**
* Release callback for boxed thread references. * Release callback for boxed thread references.
*/ */
static void _boxedPthreadRelease(NSMapTable* t, void* value) static void _boxedPthreadRelease(NSMapTable *t, void *value)
{ {
RELEASE((NSValue*)value); RELEASE((NSValue*)value);
} }
@ -478,7 +478,7 @@ static void _boxedPthreadRelease(NSMapTable* t, void* value)
/** /**
* Description callback for boxed thread references. * Description callback for boxed thread references.
*/ */
static NSString *_boxedPthreadDescribe(NSMapTable* t, const void* value) static NSString *_boxedPthreadDescribe(NSMapTable *t, const void *value)
{ {
return [(NSValue*)value description]; return [(NSValue*)value description];
} }
@ -1112,7 +1112,7 @@ unregisterActiveThread(NSThread *thread)
/** /**
* Trampoline function called to launch the thread * Trampoline function called to launch the thread
*/ */
static void *nsthreadLauncher(void* thread) static void *nsthreadLauncher(void *thread)
{ {
NSThread *t = (NSThread*)thread; NSThread *t = (NSThread*)thread;
setThreadForCurrentThread(t); setThreadForCurrentThread(t);