linux-current-already-used-20060615

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

diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index 5858002..eaf9825 100644 (file)
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -405,6 +405,8 @@ afs_data_pointer_to_int32(const void *p)
     return ip.i32[i32_sub];
 }
 
+#ifdef AFS_LINUX20_ENV
+
 struct afs_md5 {
     unsigned int sz[2];
     afs_int32 counter[4];
@@ -599,13 +601,13 @@ AFS_MD5_Update (struct afs_md5 *m, const void *v, size_t len)
        if(offset == 64){
 #if defined(AFSBIG_ENDIAN)
            int i;
-           afs_uint32 current[16];
-           struct x32 *u = (struct x32*)m->save;
+           afs_uint32 temp[16];
+           struct x32 *us = (struct x32*)m->save;
            for(i = 0; i < 8; i++){
-               current[2*i+0] = swap_u_int32_t(u[i].a);
-               current[2*i+1] = swap_u_int32_t(u[i].b);
+               temp[2*i+0] = swap_u_int32_t(us[i].a);
+               temp[2*i+1] = swap_u_int32_t(us[i].b);
            }
-           calc(m, current);
+           calc(m, temp);
 #else
            calc(m, (afs_uint32*)m->save);
 #endif
@@ -652,10 +654,10 @@ afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
     struct afs_md5 ct;
     
     if (afs_new_inum) {
-       MD5_Init(&ct);
-       MD5_Update(&ct, &volume, 4);
-       MD5_Update(&ct, &vnode, 4);
-       MD5_Final(digest, &ct);
+       AFS_MD5_Init(&ct);
+       AFS_MD5_Update(&ct, &volume, 4);
+       AFS_MD5_Update(&ct, &vnode, 4);
+       AFS_MD5_Final(digest, &ct);
        memcpy(&ino, digest, sizeof(ino_t));
     } else {
        ino = (volume << 16) + vnode;
@@ -663,3 +665,12 @@ afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
     }
     return ino;
 }
+
+#else
+
+afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
+{
+    return (volume << 16) + vnode;
+}
+
+#endif