From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 9 Nov 2004 17:09:39 +0000 (+0000)
Subject: STABLE14-irix-cleanup-20041019
X-Git-Tag: openafs-devel-1_3_74~17
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=88a8e8416db622148efbe360ee681419641c754e;p=packages%2Fo%2Fopenafs.git

STABLE14-irix-cleanup-20041019


clean up my messes.


(cherry picked from commit 37e865b235ad6e7d85c4cc47f842d60c60965b4a)
---

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index 7f191b472..24b731a33 100644
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -160,7 +160,7 @@ afs_pag_wait(struct AFS_UCRED **acred)
   if(afs_pag_sleep(acred)) {
     if(!afs_pag_sleepcnt) {
       printf("%s() PAG throttling triggered, pid %d... sleeping.  sleepcnt %d\n",
-	     __func__, getpid(), afs_pag_sleepcnt);
+	     "afs_pag_wait", getpid(), afs_pag_sleepcnt);
     }
     
     afs_pag_sleepcnt++;
diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h
index b69a66fe4..3999b7014 100644
--- a/src/ubik/ubik.p.h
+++ b/src/ubik/ubik.p.h
@@ -366,7 +366,7 @@ extern afs_int32 ugen_ClientInit(int noAuthFlag, char *confDir, char *cellName,
 				 struct ubik_client **uclientp,
 				 int (*secproc) (), char *funcName, 
 				 afs_int32 gen_rxkad_level, 
-				 afs_int32 maxservers, afs_int32 serviceid, 
+				 afs_int32 maxservers, char *serviceid, 
 				 afs_int32 deadtime, afs_uint32 server, 
 				 afs_uint32 port, afs_int32 usrvid);
 
diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c
index 32c6bf125..650fcd2ec 100644
--- a/src/ubik/uinit.c
+++ b/src/ubik/uinit.c
@@ -57,7 +57,7 @@ afs_int32
 ugen_ClientInit(int noAuthFlag, char *confDir, char *cellName, afs_int32 sauth,
 	       struct ubik_client **uclientp, int (*secproc) (),
 	       char *funcName, afs_int32 gen_rxkad_level, 
-	       afs_int32 maxservers, afs_int32 serviceid, afs_int32 deadtime,
+	       afs_int32 maxservers, char *serviceid, afs_int32 deadtime,
 	       afs_uint32 server, afs_uint32 port, afs_int32 usrvid)
 {
     afs_int32 code, scIndex, i;