From 9229794ab33fa510a5896784958b90f87bef6876 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 21 Nov 2006 11:58:14 +0000 Subject: insmod_ng_main: -80 bytes. Stopp mmapping, use xmalloc_open_read_close(). --- archival/libunarchive/archive_xread_all_eof.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'archival/libunarchive') diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c index 8513ffecb..007f68c6d 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 -#include -#include #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; } -- cgit v1.2.3