jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 05:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DEVEL15-md5-formerly-fbsd-saddr-wtf-20060601

Browse Source 
seemlingly unrelated change in with some other stuff, so i can't just pull or leave it
This commit is contained in:
Jim Rees 2006-06-01 16:49:56 +00:00 committed by Derrick Brashear
parent 7c2285d7a2
commit 3818718c63
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/afs/afs_util.c
View File

@ -51,10 +51,6 @@ RCSID
#include <sys/fp_io.h> #include <sys/fp_io.h>
#endif #endif
#if defined(AFS_XBSD_ENV)
#include <crypto/md5.h>
#endif
afs_int32 afs_new_inum = 0; afs_int32 afs_new_inum = 0;
#ifndef afs_cv2string #ifndef afs_cv2string
@ -409,14 +405,7 @@ afs_data_pointer_to_int32(const void *p)
return ip.i32[i32_sub]; return ip.i32[i32_sub];
} }
#if defined(AFS_XBSD_ENV) #ifdef AFS_LINUX20_ENV
#define afs_md5 MD5Context
#define AFS_MD5_Init(m) MD5Init((m))
#define AFS_MD5_Update(m, p, l) MD5Update((m), (void *)(p), (l))
#define AFS_MD5_Final(r, m) MD5Final((r), (m))
#else
struct afs_md5 { struct afs_md5 {
unsigned int sz[2]; unsigned int sz[2];
@ -657,7 +646,6 @@ AFS_MD5_Final (void *res, struct afs_md5 *m)
} }
} }
} }
#endif
afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode) afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
{ {
@ -677,3 +665,12 @@ afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
} }
return ino; return ino;
} }
#else
afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
{
return (volume << 16) + vnode;
}
#endif