diff options
| author | Gustavo Zacarias | 2016-10-10 22:54:24 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-10-19 12:11:59 +0200 |
| commit | 7f0d4d56a2f1ed34c3da4501e65fb79497b3dda1 (patch) | |
| tree | eeca870689c5084128ffa5a49c845d2c19df308c /disk-utils/fsck.cramfs.c | |
| parent | fstrim: add -v to the systemd service (diff) | |
| download | kernel-qcow2-util-linux-7f0d4d56a2f1ed34c3da4501e65fb79497b3dda1.tar.gz kernel-qcow2-util-linux-7f0d4d56a2f1ed34c3da4501e65fb79497b3dda1.tar.xz kernel-qcow2-util-linux-7f0d4d56a2f1ed34c3da4501e65fb79497b3dda1.zip | |
lib/crc32: prefix public functions
Make the publicly-visible crc32 library functions prefixed by ul_, such
as crc32() -> ul_crc32().
This is because it clashes with the crc32() function from zlib.
For newer versions of glib (2.50+) zlib and libblkid are required
dependencies and otherwise results in build failure when building
statically.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Diffstat (limited to 'disk-utils/fsck.cramfs.c')
| -rw-r--r-- | disk-utils/fsck.cramfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 12009f21c..f34e79f90 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -214,7 +214,7 @@ static void test_crc(int start) return; } - crc = crc32(0L, Z_NULL, 0); + crc = ul_crc32(0L, Z_NULL, 0); buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); @@ -231,8 +231,8 @@ static void test_crc(int start) } if (buf != MAP_FAILED) { ((struct cramfs_super *)((unsigned char *) buf + start))->fsid.crc = - crc32(0L, Z_NULL, 0); - crc = crc32(crc, (unsigned char *) buf + start, super.size - start); + ul_crc32(0L, Z_NULL, 0); + crc = ul_crc32(crc, (unsigned char *) buf + start, super.size - start); munmap(buf, super.size); } else { int retval; @@ -249,15 +249,15 @@ static void test_crc(int start) break; if (length == 0) ((struct cramfs_super *)buf)->fsid.crc = - crc32(0L, Z_NULL, 0); + ul_crc32(0L, Z_NULL, 0); length += retval; if (length > (super.size - start)) { - crc = crc32(crc, buf, + crc = ul_crc32(crc, buf, retval - (length - (super.size - start))); break; } - crc = crc32(crc, buf, retval); + crc = ul_crc32(crc, buf, retval); } free(buf); } |