From: Derrick Brashear Date: Mon, 23 Mar 2009 18:46:40 +0000 (+0000) Subject: viced-type-fixups-20090323 X-Git-Tag: openafs-devel-1_5_61~408 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7a7b55658b7c72eef0f9b495f02ce766c9961d6e;p=packages%2Fo%2Fopenafs.git viced-type-fixups-20090323 LICENSE IPL10 SetLogThreadNum takes a fcn returning int. get_key's first arg is a void* --- diff --git a/src/viced/viced.c b/src/viced/viced.c index e87f6a4bf..2d5d18287 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -352,7 +352,7 @@ ResetCheckDescriptors(void) } #if defined(AFS_PTHREAD_ENV) -int * +int threadNum(void) { return pthread_getspecific(rx_thread_id_key); @@ -361,7 +361,7 @@ threadNum(void) /* proc called by rxkad module to get a key */ static int -get_key(char *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey) +get_key(void *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey) { /* find the key */ static struct afsconf_key tkey;