From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Sat, 2 Apr 2011 13:43:26 +0000 (-0400)
Subject: Convert ubik_Call(x) calls to ubik_x()
X-Git-Tag: upstream/1.6.18^2~23
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7883453bc474d6d53fc4a71898dcc1998fe0d3b9;p=packages%2Fo%2Fopenafs.git

Convert ubik_Call(x) calls to ubik_x()

Convert remaining ubik_Call(function, ..) users to ubik_function(..).

Reviewed-on: http://gerrit.openafs.org/4399
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit b3094a39b74c0c593f6dcac945ad5e4bbf155c2d)

Change-Id: Ida6d324e744904606c7cbfc073b60e0ed5733ed7
Reviewed-on: https://gerrit.openafs.org/11780
Reviewed-by: Jeffrey Altman <jaltman@auristor.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c
index 531c3c57b..f4589b577 100644
--- a/src/bucoord/commands.c
+++ b/src/bucoord/commands.c
@@ -244,7 +244,7 @@ EvalVolumeSet2(struct bc_config *aconfig,
 	    bulkentries.nbulkentries_val = 0;
 	    nsi = -1;
 	    tcode =
-		ubik_Call(VL_ListAttributesN2, uclient, 0, &attributes,
+		ubik_VL_ListAttributesN2(uclient, 0, &attributes,
 			  tve->name, si, &nentries, &bulkentries, &nsi);
 	    if (tcode)
 		ERROR(tcode);
@@ -461,8 +461,7 @@ EvalVolumeSet1(struct bc_config *aconfig,
      */
     for (index = 0; 1; index = next_index) {	/*w */
 	memset(&entry, 0, sizeof(entry));
-	code = ubik_Call(VL_ListEntry,	/*Routine to invoke */
-			 uclient,	/*Ubik client structure */
+	code = ubik_VL_ListEntry(uclient,	/*Ubik client structure */
 			 0,	/*Ubik flags */
 			 index,	/*Current index */
 			 &count,	/*Ptr to working variable */
@@ -2289,7 +2288,7 @@ bc_dbVerifyCmd(struct cmd_syndesc *as, void *arock)
     detail = (as->parms[0].items ? 1 : 0);	/* print more details */
 
     code =
-	ubik_Call(BUDB_DbVerify, udbHandle.uh_client, 0, &status, &orphans,
+	ubik_BUDB_DbVerify(udbHandle.uh_client, 0, &status, &orphans,
 		  &host);
 
     if (code) {
@@ -3104,7 +3103,7 @@ printRecentDumps(int ndumps)
 	dl.budb_dumpList_val = 0;
 
 	/* outline algorithm */
-	code = ubik_Call(BUDB_GetDumps, udbHandle.uh_client, 0, BUDB_MAJORVERSION, BUDB_OP_NPREVIOUS, "",	/* no name */
+	code = ubik_BUDB_GetDumps(udbHandle.uh_client, 0, BUDB_MAJORVERSION, BUDB_OP_NPREVIOUS, "",	/* no name */
 			 0,	/* start */
 			 ndumps,	/* end */
 			 index,	/* index */
diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c
index 1bf4f1e88..c077c9eda 100644
--- a/src/uss/uss_kauth.c
+++ b/src/uss/uss_kauth.c
@@ -698,7 +698,7 @@ uss_kauth_SetFields(char *username, char *expirestring, char *reuse,
 	    if (!expiration)
 		expiration = uss_Expires;
 	    code =
-		ubik_Call(KAM_SetFields, uconn_kauthP, 0, username, &instance,
+		ubik_KAM_SetFields(uconn_kauthP, 0, username, &instance,
 			  flags, expiration, lifetime, maxAssociates,
 			  was_spare, /* spare */ 0);
 	} else