Portability and style fixes:

  * Actually use the HAVE_<header>_H macros to conditionally include
    system headers.  They've been defined for a long time, but only
    used in a few places.  Now they're used pretty consistently
    throughout.
  * Fill in a lot of missing casts for conversions from void*.
    Although Standard C doesn't require this, some people have been
    trying to use C++ compilers with this code, and they do require it.

Bit-for-bit, the compiled object files are identical, except for
one assert() whose line number changed, so I'm pretty confident I
didn't break anything.  ;-)

1 files changed, 10 insertions, 4 deletions

diff --git a/lib/libarchive/archive_write_set_compression_none.c b/lib/libarchive/archive_write_set_compression_none.c
index 2a63629..9e43365 100644
--- a/lib/libarchive/archive_write_set_compression_none.c
+++ b/lib/libarchive/archive_write_set_compression_none.c
@@ -27,9 +27,15 @@
 #include "archive_platform.h"
 __FBSDID("$FreeBSD$");
 
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "archive.h"
 #include "archive_private.h"
@@ -83,7 +89,7 @@ archive_compressor_none_init(struct archive *a)
 	memset(state, 0, sizeof(*state));
 
 	state->buffer_size = a->bytes_per_block;
-	state->buffer = malloc(state->buffer_size);
+	state->buffer = (char *)malloc(state->buffer_size);
 
 	if (state->buffer == NULL) {
 		archive_set_error(a, ENOMEM,
@@ -113,8 +119,8 @@ archive_compressor_none_write(struct archive *a, const void *vbuff,
 	ssize_t bytes_written;
 	struct archive_none *state;
 
-	state = a->compression_data;
-	buff = vbuff;
+	state = (struct archive_none *)a->compression_data;
+	buff = (const char *)vbuff;
 	if (a->client_writer == NULL) {
 		archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER,
 		    "No write callback is registered?  "
@@ -166,7 +172,7 @@ archive_compressor_none_finish(struct archive *a)
 	int ret2;
 	struct archive_none *state;
 
-	state = a->compression_data;
+	state = (struct archive_none *)a->compression_data;
 	ret = ret2 = ARCHIVE_OK;
 	if (a->client_writer == NULL) {
 		archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER,