From 42dea85c5aee6059052716b85aa109a2f2c7e87c Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 12 Dec 2017 11:54:08 +0100 Subject: lib/md5: use ul_/UL_ prefix The symbols names are too generic. Addresses: https://github.com/karelzak/util-linux/issues/548 Signed-off-by: Karel Zak --- disk-utils/mkfs.cramfs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'disk-utils') diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index a3e9aa48c..729765078 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -98,7 +98,7 @@ struct entry { /* stats */ unsigned char *name; unsigned int mode, size, uid, gid; - unsigned char md5sum[MD5LENGTH]; + unsigned char md5sum[UL_MD5LENGTH]; unsigned char flags; /* CRAMFS_EFLAG_* */ /* FS data */ @@ -194,16 +194,17 @@ do_munmap(char *start, unsigned int size, unsigned int mode){ /* compute md5sums, so that we do not have to compare every pair of files */ static void mdfile(struct entry *e) { - MD5_CTX ctx; char *start; start = do_mmap(e->path, e->size, e->mode); if (start == NULL) { e->flags |= CRAMFS_EFLAG_INVALID; } else { - MD5Init(&ctx); - MD5Update(&ctx, (unsigned char *) start, e->size); - MD5Final(e->md5sum, &ctx); + UL_MD5_CTX ctx; + + ul_MD5Init(&ctx); + ul_MD5Update(&ctx, (unsigned char *) start, e->size); + ul_MD5Final(e->md5sum, &ctx); do_munmap(start, e->size, e->mode); @@ -255,7 +256,7 @@ static int find_identical_file(struct entry *orig, struct entry *new, loff_t *fs if ((orig->flags & CRAMFS_EFLAG_MD5) && (new->flags & CRAMFS_EFLAG_MD5) && - !memcmp(orig->md5sum, new->md5sum, MD5LENGTH) && + !memcmp(orig->md5sum, new->md5sum, UL_MD5LENGTH) && identical_file(orig, new)) { new->same = orig; *fslen_ub -= new->size; -- cgit v1.2.3-55-g7522