From d7b2bdd57bd1e19bac66eae0cc75c29934eb8990 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 23 Mar 2009 18:46:52 +0000 Subject: [PATCH] DEVEL15-viced-type-fixups-20090323 LICENSE IPL10 SetLogThreadNum takes a fcn returning int. get_key's first arg is a void* (cherry picked from commit 7a7b55658b7c72eef0f9b495f02ce766c9961d6e) --- src/viced/viced.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/viced/viced.c b/src/viced/viced.c index ff15c477f..53a88d0e6 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -348,7 +348,7 @@ ResetCheckDescriptors(void) } #if defined(AFS_PTHREAD_ENV) -int * +int threadNum(void) { return pthread_getspecific(rx_thread_id_key); @@ -357,7 +357,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; -- 2.39.5