From a343f09803a4b3d5c5492c7d52becbd1526c1f8b Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 19 Mar 2009 14:58:22 +0000 Subject: [PATCH] viced-type-errors-20090319 LICENSE IPL10 use ktc_encryptionKey instead of a char array to avoid prototype issues threadNum should return int, not char --- src/viced/viced.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/viced/viced.c b/src/viced/viced.c index 1fe5583..e87f6a4 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -352,7 +352,7 @@ ResetCheckDescriptors(void) } #if defined(AFS_PTHREAD_ENV) -char * +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, char *akey) +get_key(char *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey) { /* find the key */ static struct afsconf_key tkey; @@ -371,7 +371,7 @@ get_key(char *arock, register afs_int32 akvno, char *akey) ViceLog(0, ("conf dir not open\n")); return 1; } - code = afsconf_GetKey(confDir, akvno, tkey.key); + code = afsconf_GetKey(confDir, akvno, (struct ktc_encryptionKey *)tkey.key); if (code) { ViceLog(0, ("afsconf_GetKey failure: kvno %d code %d\n", akvno, code)); return code; -- 1.9.4