From: Mark Vitale <mvitale@sinenomine.net>
Date: Fri, 4 May 2018 19:42:14 +0000 (-0400)
Subject: ubik: make ContactQuorum_* routines static
X-Git-Tag: upstream/1.8.3^2~32
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b71f75cad51cf58260d0593635d66dd367a2af1a;p=packages%2Fo%2Fopenafs.git

ubik: make ContactQuorum_* routines static

Most of the ContactQuorum_* routines are only used in ubik.c, so make
them all static - except for ContactQuorum_DISK_SetVersion, which is
called from disk.c.

Reviewed-on: https://gerrit.openafs.org/13078
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 27d7b8fe4603c39362983758fe6a749fa5ffa4e5)

Change-Id: I70721aef02f5f2e203c1877428c46c49ea1cb7c9
Reviewed-on: https://gerrit.openafs.org/13188
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Joe Gorse <jhgorse@gmail.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c
index 2345fa31f..30beacfd2 100644
--- a/src/ubik/ubik.c
+++ b/src/ubik/ubik.c
@@ -223,7 +223,7 @@ ContactQuorum_rcode(int okcalls, afs_int32 rcode)
  * because it is sent the sync count along with the beacon message that
  * marks it as \b really up (\p beaconSinceDown).
  */
-afs_int32
+static afs_int32
 ContactQuorum_NoArguments(afs_int32 (*proc)(struct rx_connection *, ubik_tid *),
 	       		  struct ubik_trans *atrans, int aflags)
 {
@@ -242,7 +242,7 @@ ContactQuorum_NoArguments(afs_int32 (*proc)(struct rx_connection *, ubik_tid *),
 }
 
 
-afs_int32
+static afs_int32
 ContactQuorum_DISK_Lock(struct ubik_trans *atrans, int aflags,afs_int32 file,
 			afs_int32 position, afs_int32 length, afs_int32 type)
 {
@@ -260,7 +260,7 @@ ContactQuorum_DISK_Lock(struct ubik_trans *atrans, int aflags,afs_int32 file,
     return ContactQuorum_rcode(okcalls, rcode);
 }
 
-afs_int32
+static afs_int32
 ContactQuorum_DISK_Truncate(struct ubik_trans *atrans, int aflags,
 			    afs_int32 file, afs_int32 length)
 {
@@ -279,7 +279,7 @@ ContactQuorum_DISK_Truncate(struct ubik_trans *atrans, int aflags,
 }
 
 
-afs_int32
+static afs_int32
 ContactQuorum_DISK_WriteV(struct ubik_trans *atrans, int aflags,
 			  iovec_wrt * io_vector, iovec_buf *io_buffer)
 {
diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h
index 06f532174..d703ce0a0 100644
--- a/src/ubik/ubik.p.h
+++ b/src/ubik/ubik.p.h
@@ -462,26 +462,6 @@ extern int DoProbe(struct ubik_server *server);
 /*\}*/
 
 /*! \name ubik.c */
-extern afs_int32 ContactQuorum_NoArguments(afs_int32 (*proc)
-						       (struct rx_connection *,
-							ubik_tid *),
-					   struct ubik_trans *atrans,
-					   int aflags);
-
-extern afs_int32 ContactQuorum_DISK_Lock(struct ubik_trans *atrans,
-					 int aflags,
-					 afs_int32 file, afs_int32 position,
-					 afs_int32 length, afs_int32 type);
-
-extern afs_int32 ContactQuorum_DISK_Truncate(struct ubik_trans *atrans,
-					     int aflags,
-					     afs_int32 file, afs_int32 length);
-
-extern afs_int32 ContactQuorum_DISK_WriteV(struct ubik_trans *atrans,
-					   int aflags,
-					   iovec_wrt * io_vector,
-					   iovec_buf *io_buffer);
-
 extern afs_int32 ContactQuorum_DISK_SetVersion(struct ubik_trans *atrans,
 					       int aflags,
 					       ubik_version *OldVersion,