From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 23 Mar 2009 18:46:52 +0000 (+0000)
Subject: DEVEL15-viced-type-fixups-20090323
X-Git-Tag: openafs-devel-1_5_58~27
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d7b2bdd57bd1e19bac66eae0cc75c29934eb8990;p=packages%2Fo%2Fopenafs.git

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)
---

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;