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 f04aec9598436719978e84b565b4f3308417657e..00e8e908006dd838e1db813b7c2a1272e4c5f631 100644 (file)
--- 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);