Rename the archive_endian.h functions to avoid name clashes

with NetBSD's sys/endian.h file.

Pointed out by: Joerg Sonnenberger

2 files changed, 41 insertions, 39 deletions

diff --git a/lib/libarchive/archive_endian.h b/lib/libarchive/archive_endian.h
index 0df32d5..7c7fced 100644
--- a/lib/libarchive/archive_endian.h
+++ b/lib/libarchive/archive_endian.h
@@ -34,7 +34,7 @@
 /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
 
 static inline uint16_t
-be16dec(const void *pp)
+archive_be16dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -42,7 +42,7 @@ be16dec(const void *pp)
 }
 
 static inline uint32_t
-be32dec(const void *pp)
+archive_be32dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -50,15 +50,15 @@ be32dec(const void *pp)
 }
 
 static inline uint64_t
-be64dec(const void *pp)
+archive_be64dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
-	return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4));
+	return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4));
 }
 
 static inline uint16_t
-le16dec(const void *pp)
+archive_le16dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -66,7 +66,7 @@ le16dec(const void *pp)
 }
 
 static inline uint32_t
-le32dec(const void *pp)
+archive_le32dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
@@ -74,15 +74,15 @@ le32dec(const void *pp)
 }
 
 static inline uint64_t
-le64dec(const void *pp)
+archive_le64dec(const void *pp)
 {
 	unsigned char const *p = (unsigned char const *)pp;
 
-	return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p));
+	return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p));
 }
 
 static inline void
-be16enc(void *pp, uint16_t u)
+archive_be16enc(void *pp, uint16_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -91,7 +91,7 @@ be16enc(void *pp, uint16_t u)
 }
 
 static inline void
-be32enc(void *pp, uint32_t u)
+archive_be32enc(void *pp, uint32_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -102,16 +102,16 @@ be32enc(void *pp, uint32_t u)
 }
 
 static inline void
-be64enc(void *pp, uint64_t u)
+archive_be64enc(void *pp, uint64_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
-	be32enc(p, u >> 32);
-	be32enc(p + 4, u & 0xffffffff);
+	archive_be32enc(p, u >> 32);
+	archive_be32enc(p + 4, u & 0xffffffff);
 }
 
 static inline void
-le16enc(void *pp, uint16_t u)
+archive_le16enc(void *pp, uint16_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -120,7 +120,7 @@ le16enc(void *pp, uint16_t u)
 }
 
 static inline void
-le32enc(void *pp, uint32_t u)
+archive_le32enc(void *pp, uint32_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
@@ -131,12 +131,12 @@ le32enc(void *pp, uint32_t u)
 }
 
 static inline void
-le64enc(void *pp, uint64_t u)
+archive_le64enc(void *pp, uint64_t u)
 {
 	unsigned char *p = (unsigned char *)pp;
 
-	le32enc(p, u & 0xffffffff);
-	le32enc(p + 4, u >> 32);
+	archive_le32enc(p, u & 0xffffffff);
+	archive_le32enc(p + 4, u >> 32);
 }
 
 #endif
diff --git a/lib/libarchive/archive_read_support_format_zip.c b/lib/libarchive/archive_read_support_format_zip.c
index d96bea6..0fc0525 100644
--- a/lib/libarchive/archive_read_support_format_zip.c
+++ b/lib/libarchive/archive_read_support_format_zip.c
@@ -278,8 +278,8 @@ zip_read_file_header(struct archive_read *a, struct archive_entry *entry,
 
 	zip->version = p->version[0];
 	zip->system = p->version[1];
-	zip->flags = le16dec(p->flags);
-	zip->compression = le16dec(p->compression);
+	zip->flags = archive_le16dec(p->flags);
+	zip->compression = archive_le16dec(p->compression);
 	if (zip->compression <
 	    sizeof(compression_names)/sizeof(compression_names[0]))
 		zip->compression_name = compression_names[zip->compression];
@@ -291,11 +291,11 @@ zip_read_file_header(struct archive_read *a, struct archive_entry *entry,
 	zip->mode = 0;
 	zip->uid = 0;
 	zip->gid = 0;
-	zip->crc32 = le32dec(p->crc32);
-	zip->filename_length = le16dec(p->filename_length);
-	zip->extra_length = le16dec(p->extra_length);
-	zip->uncompressed_size = le32dec(p->uncompressed_size);
-	zip->compressed_size = le32dec(p->compressed_size);
+	zip->crc32 = archive_le32dec(p->crc32);
+	zip->filename_length = archive_le16dec(p->filename_length);
+	zip->extra_length = archive_le16dec(p->extra_length);
+	zip->uncompressed_size = archive_le32dec(p->uncompressed_size);
+	zip->compressed_size = archive_le32dec(p->compressed_size);
 
 	(a->decompressor->consume)(a, sizeof(struct zip_file_header));
 
@@ -397,9 +397,9 @@ archive_read_format_zip_read_data(struct archive_read *a,
 					    "Truncated ZIP end-of-file record");
 					return (ARCHIVE_FATAL);
 				}
-				zip->crc32 = le32dec(p + 4);
-				zip->compressed_size = le32dec(p + 8);
-				zip->uncompressed_size = le32dec(p + 12);
+				zip->crc32 = archive_le32dec(p + 4);
+				zip->compressed_size = archive_le32dec(p + 8);
+				zip->uncompressed_size = archive_le32dec(p + 12);
 				(a->decompressor->consume)(a, 16);
 			}
 
@@ -707,8 +707,8 @@ process_extra(const void* extra, struct zip* zip)
 	const char *p = (const char *)extra;
 	while (offset < zip->extra_length - 4)
 	{
-		unsigned short headerid = le16dec(p + offset);
-		unsigned short datasize = le16dec(p + offset + 2);
+		unsigned short headerid = archive_le16dec(p + offset);
+		unsigned short datasize = archive_le16dec(p + offset + 2);
 		offset += 4;
 		if (offset + datasize > zip->extra_length)
 			break;
@@ -720,9 +720,9 @@ process_extra(const void* extra, struct zip* zip)
 		case 0x0001:
 			/* Zip64 extended information extra field. */
 			if (datasize >= 8)
-				zip->uncompressed_size = le64dec(p + offset);
+				zip->uncompressed_size = archive_le64dec(p + offset);
 			if (datasize >= 16)
-				zip->compressed_size = le64dec(p + offset + 8);
+				zip->compressed_size = archive_le64dec(p + offset + 8);
 			break;
 		case 0x5455:
 		{
@@ -735,11 +735,12 @@ process_extra(const void* extra, struct zip* zip)
 			{
 #ifdef DEBUG
 				fprintf(stderr, "mtime: %lld -> %d\n",
-				    (long long)zip->mtime, le32dec(p + offset));
+				    (long long)zip->mtime,
+				    archive_le32dec(p + offset));
 #endif
 				if (datasize < 4)
 					break;
-				zip->mtime = le32dec(p + offset);
+				zip->mtime = archive_le32dec(p + offset);
 				offset += 4;
 				datasize -= 4;
 			}
@@ -747,7 +748,7 @@ process_extra(const void* extra, struct zip* zip)
 			{
 				if (datasize < 4)
 					break;
-				zip->atime = le32dec(p + offset);
+				zip->atime = archive_le32dec(p + offset);
 				offset += 4;
 				datasize -= 4;
 			}
@@ -755,7 +756,7 @@ process_extra(const void* extra, struct zip* zip)
 			{
 				if (datasize < 4)
 					break;
-				zip->ctime = le32dec(p + offset);
+				zip->ctime = archive_le32dec(p + offset);
 				offset += 4;
 				datasize -= 4;
 			}
@@ -765,12 +766,13 @@ process_extra(const void* extra, struct zip* zip)
 			/* Info-ZIP Unix Extra Field (type 2) "Ux". */
 #ifdef DEBUG
 			fprintf(stderr, "uid %d gid %d\n",
-			    le16dec(p + offset), le16dec(p + offset + 2));
+			    archive_le16dec(p + offset),
+			    archive_le16dec(p + offset + 2));
 #endif
 			if (datasize >= 2)
-				zip->uid = le16dec(p + offset);
+				zip->uid = archive_le16dec(p + offset);
 			if (datasize >= 4)
-				zip->gid = le16dec(p + offset + 2);
+				zip->gid = archive_le16dec(p + offset + 2);
 			break;
 		default:
 			break;