Fix a symbol conflict with crc32

On FreeBSD, the crc32 symbol conflicts with a function of the same
name in libz, causing segfaults. Fixes bug 589786.

3 files changed, 4 insertions, 4 deletions

diff --git a/metadata/crc32.c b/metadata/crc32.c
index 5eb64df2..5441f8ca 100644
--- a/metadata/crc32.c
+++ b/metadata/crc32.c
@@ -82,7 +82,7 @@ static const guint32 crcTable[256] = {
 };
 
 guint32
-crc32 (const void *ptr, size_t len)
+metadata_crc32 (const void *ptr, size_t len)
 {
   guint32 crc = 0xFFFFFFFF;
   const guint8 *bp = (const guint8 *) ptr;
diff --git a/metadata/crc32.h b/metadata/crc32.h
index 2a820bda..b8a62b19 100644
--- a/metadata/crc32.h
+++ b/metadata/crc32.h
@@ -46,4 +46,4 @@
 
 #include <glib.h>
 
-guint32 crc32(const void *ptr, size_t len);
+guint32 metadata_crc32(const void *ptr, size_t len);
diff --git a/metadata/metatree.c b/metadata/metatree.c
index 0f66893b..18bdc438 100644
--- a/metadata/metatree.c
+++ b/metadata/metatree.c
@@ -896,7 +896,7 @@ verify_journal_entry (MetaJournal *journal,
   if (entry_len != entry_len_end)
     return NULL;
 
-  real_crc32 = crc32 (journal->data + offset + 8, entry_len - 8);
+  real_crc32 = metadata_crc32 (journal->data + offset + 8, entry_len - 8);
   if (real_crc32 != GUINT32_FROM_BE (entry->crc32))
     return NULL;
 
@@ -1019,7 +1019,7 @@ meta_journal_entry_finish (GString *out)
   len = out->len + 4;
   append_uint32 (out, len);
   set_uint32 (out, 0, len);
-  set_uint32 (out, 4, crc32 (out->str + 8, len - 8));
+  set_uint32 (out, 4, metadata_crc32 (out->str + 8, len - 8));
   return out;
 }