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>

diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 12009f21c3ee71fe7719b76b7f7a29ade681e9b3..f34e79f9035ddc636b27ace0718aac07aeb140df 100644 (file)
--- 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);
        }

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 4e6b3ab85a2a1430a8224751757042a94b3c4406..55d68716b352ff9e2e7082fed82c4d2069751e15 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -406,7 +406,7 @@ static unsigned int write_superblock(struct entry *root, char *base, int size)
        super->size = size;
        memcpy(super->signature, CRAMFS_SIGNATURE, sizeof(super->signature));
 
-       super->fsid.crc = crc32(0L, Z_NULL, 0);
+       super->fsid.crc = ul_crc32(0L, Z_NULL, 0);
        super->fsid.edition = opt_edition;
        super->fsid.blocks = total_blocks;
        super->fsid.files = total_nodes;
@@ -700,7 +700,7 @@ int main(int argc, char **argv)
        loff_t fslen_ub = sizeof(struct cramfs_super);
        unsigned int fslen_max;
        char const *dirname, *outfile;
-       uint32_t crc = crc32(0L, Z_NULL, 0);
+       uint32_t crc = ul_crc32(0L, Z_NULL, 0);
        int c;
        cramfs_is_big_endian = HOST_IS_BIG_ENDIAN; /* default is to use host order */
 
@@ -856,7 +856,7 @@ int main(int argc, char **argv)
                       sizeof(struct cramfs_super));
 
        /* Put the checksum in. */
-       crc = crc32(crc, (unsigned char *) (rom_image+opt_pad), (offset-opt_pad));
+       crc = ul_crc32(crc, (unsigned char *) (rom_image+opt_pad), (offset-opt_pad));
        ((struct cramfs_super *) (rom_image+opt_pad))->fsid.crc = u32_toggle_endianness(cramfs_is_big_endian, crc);
        if (verbose)
                printf(_("CRC: %x\n"), crc);

diff --git a/include/crc32.h b/include/crc32.h
index ff2dd99d874115acc000764bab2e7a14c54e334d..2551f50de1fa3a6154181b9568723654a0673564 100644 (file)
--- a/include/crc32.h
+++ b/include/crc32.h
@@ -4,8 +4,8 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-extern uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len);
-extern uint32_t crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len,
+extern uint32_t ul_crc32(uint32_t seed, const unsigned char *buf, size_t len);
+extern uint32_t ul_crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len,
                                              size_t exclude_off, size_t exclude_len);
 
 #endif

diff --git a/lib/crc32.c b/lib/crc32.c
index a5e3216b870a06324b8bc785f54ff933aa25c32a..824693d017a0f21bee00bd7ff61e53ae4136b7e4 100644 (file)
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -108,7 +108,7 @@ static inline uint32_t crc32_add_char(uint32_t crc, unsigned char c)
  * and does __not__ xor at the end. Then individual users can do
  * whatever they need.
  */
-uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len)
+uint32_t ul_crc32(uint32_t seed, const unsigned char *buf, size_t len)
 {
        uint32_t crc = seed;
        const unsigned char *p = buf;
@@ -121,7 +121,7 @@ uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len)
        return crc;
 }
 
-uint32_t crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len,
+uint32_t ul_crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len,
                              size_t exclude_off, size_t exclude_len)
 {
        uint32_t crc = seed;

diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c
index dcc04e617212e3a1474c3f284e5791ced5bba8b3..e6baa598b8f2354621b3f3060a61dc5f8e487738 100644 (file)
--- a/libblkid/src/partitions/gpt.c
+++ b/libblkid/src/partitions/gpt.c
@@ -105,7 +105,7 @@ struct gpt_entry {
 static inline uint32_t count_crc32(const unsigned char *buf, size_t len,
                                   size_t exclude_off, size_t exclude_len)
 {
-       return (crc32_exclude_offset(~0L, buf, len, exclude_off, exclude_len) ^ ~0L);
+       return (ul_crc32_exclude_offset(~0L, buf, len, exclude_off, exclude_len) ^ ~0L);
 }
 
 static inline unsigned char *get_lba_buffer(blkid_probe pr,

diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c
index ee5c5f9b4844927c6029464a56ce7f9106cb76fa..95538ef7bda68c0c81b04ff24875913b80d55919 100644 (file)
--- 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));
 }

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 8377192580084795f837a7e971816674c0767a0f..208699bfcd42b12aa921c7165092489d361ff0f9 100644 (file)
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -850,7 +850,7 @@ fail:
 static inline uint32_t count_crc32(const unsigned char *buf, size_t len,
                                   size_t ex_off, size_t ex_len)
 {
-       return (crc32_exclude_offset(~0L, buf, len, ex_off, ex_len) ^ ~0L);
+       return (ul_crc32_exclude_offset(~0L, buf, len, ex_off, ex_len) ^ ~0L);
 }
 
 static inline uint32_t gpt_header_count_crc32(struct gpt_header *header)