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

STABLE14-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 ab3c5a3b6..d4f83a14e 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -315,7 +315,7 @@ ResetCheckDescriptors(void)
 }
 
 #if defined(AFS_PTHREAD_ENV)
-char *
+int
 threadNum(void)
 {
     return pthread_getspecific(rx_thread_id_key);
@@ -324,7 +324,7 @@ threadNum(void)
 
 /* proc called by rxkad module to get a key */
 static int
-get_key(char *arock, register afs_int32 akvno, char *akey)
+get_key(void *arock, register afs_int32 akvno, char *akey)
 {
     /* find the key */
     static struct afsconf_key tkey;