Convert all osi_timeval_t to osi_timeval32_t

[openafs.git] / src / afs / afs_icl.c

diff --git a/src/afs/afs_icl.c b/src/afs/afs_icl.c
index 60520e1..6e4ce63 100644 (file)
--- a/src/afs/afs_icl.c
+++ b/src/afs/afs_icl.c
@@ -55,16 +55,14 @@ shutdown_icl(void)
     struct afs_icl_log *logp;
     struct afs_icl_set *setp;
 
-    setp = afs_icl_FindSet("cm");
-    if (setp) {
-       /* Release the reference from Find, and the initial one */
-       afs_icl_SetFree(setp);
+    if (afs_iclSetp) {
+       setp = afs_iclSetp;  /* "cm" */
+       afs_iclSetp = NULL;
        afs_icl_SetFree(setp);
     }
-    setp = afs_icl_FindSet("cmlongterm");
-    if (setp) {
-       /* Release the reference from Find, and the initial one */
-       afs_icl_SetFree(setp);
+    if (afs_iclLongTermSetp) {
+       setp = afs_iclLongTermSetp; /* "cmlongterm" */
+       afs_iclLongTermSetp = NULL;
        afs_icl_SetFree(setp);
     }
     logp = afs_icl_FindLog("cmfx");
@@ -240,7 +238,7 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval)
        setp = afs_icl_FindSet(tname);
        if (!setp)
            return ENOENT;
-       if (p2 > ICL_LOGSPERSET)
+       if (p2 >= ICL_LOGSPERSET)
            return EINVAL;
        if (!(tlp = setp->logs[p2]))
            return EBADF;
@@ -616,7 +614,7 @@ afs_icl_AppendRecord(struct afs_icl_log *logp, afs_int32 op,
 {
     int rsize;                 /* record size in longs */
     int tsize;         /* temp size */
-    osi_timeval_t tv;
+    osi_timeval32_t tv;
     int t1, t2, t3, t4;
 
     t4 = types & 0x3f;         /* decode types */