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 /libblkid/src/superblocks | |
| 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 'libblkid/src/superblocks')
| -rw-r--r-- | libblkid/src/superblocks/nilfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c index ee5c5f9b4..95538ef7b 100644 --- a/libblkid/src/superblocks/nilfs.c +++ b/libblkid/src/superblocks/nilfs.c @@ -89,9 +89,9 @@ static int nilfs_valid_sb(blkid_probe pr, struct nilfs_super_block *sb, int is_b if (bytes < crc_start || bytes > sizeof(struct nilfs_super_block)) return 0; - crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); - crc = crc32(crc, sum, 4); - crc = crc32(crc, (unsigned char *)sb + crc_start, bytes - crc_start); + crc = ul_crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); + crc = ul_crc32(crc, sum, 4); + crc = ul_crc32(crc, (unsigned char *)sb + crc_start, bytes - crc_start); return blkid_probe_verify_csum(pr, crc, le32_to_cpu(sb->s_sum)); } |