insmod_ng_main: -80 bytes. Stopp mmapping, use xmalloc_open_read_close().

1 files changed, 6 insertions, 7 deletions

diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c
index 8513ffe..007f68c 100644
--- a/archival/libunarchive/archive_xread_all_eof.c
+++ b/archival/libunarchive/archive_xread_all_eof.c
@@ -3,19 +3,18 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "unarchive.h"
 #include "libbb.h"
 
-ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count)
+ssize_t archive_xread_all_eof(archive_handle_t *archive_handle,
+			unsigned char *buf, size_t count)
 {
 	ssize_t size;
 
 	size = full_read(archive_handle->src_fd, buf, count);
-	if ((size != 0) && (size != count)) {
-		bb_perror_msg_and_die("short read, read %ld of %ld", (long)size, (long)count);
+	if (size != 0 && size != count) {
+		bb_error_msg_and_die("short read: %u of %u",
+				(unsigned)size, (unsigned)count);
 	}
-	return(size);
+	return size;
 }