From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 19 Mar 2007 13:46:15 +0000 (+0000)
Subject: DEVEL15-windows-var-renaming-20070319
X-Git-Tag: openafs-devel-1_5_17~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=92124f3108ccbc36a1e047edb46a40c92a9c8212;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-var-renaming-20070319


give rx call variables a distinct name from cm call variables
in order to avoid confusion


(cherry picked from commit b4f323eaeb5f010cd0a0be09f29c4016d1a14fef)
---

diff --git a/src/WINNT/afsd/cm_server.c b/src/WINNT/afsd/cm_server.c
index f04aec959..00e8e9080 100644
--- a/src/WINNT/afsd/cm_server.c
+++ b/src/WINNT/afsd/cm_server.c
@@ -49,7 +49,7 @@ cm_PingServer(cm_server_t *tsp)
     long code;
     int wasDown = 0;
     cm_conn_t *connp;
-    struct rx_connection * callp;
+    struct rx_connection * rxconnp;
     long secs;
     long usecs;
     Capabilities caps = {0, 0};
@@ -93,11 +93,11 @@ cm_PingServer(cm_server_t *tsp)
 	}
 	else {
 	    /* file server */
-	    callp = cm_GetRxConn(connp);
-	    code = RXAFS_GetCapabilities(callp, &caps);
+	    rxconnp = cm_GetRxConn(connp);
+	    code = RXAFS_GetCapabilities(rxconnp, &caps);
 	    if (code == RXGEN_OPCODE)
-		code = RXAFS_GetTime(callp, &secs, &usecs);
-	    rx_PutConnection(callp);
+		code = RXAFS_GetTime(rxconnp, &secs, &usecs);
+	    rx_PutConnection(rxconnp);
 	}
 	if (wasDown)
 	    rx_SetConnDeadTime(connp->callp, ConnDeadtimeout);