aboutsummaryrefslogtreecommitdiff
path: root/archival/libunarchive
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-21 11:58:14 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-21 11:58:14 +0000
commit9229794ab33fa510a5896784958b90f87bef6876 (patch)
treecbf063d72178aac42b71fe233dc20e5bc226463e /archival/libunarchive
parenta8381948da79b06071c17853a9a2a59947742c8d (diff)
downloadbusybox-9229794ab33fa510a5896784958b90f87bef6876.tar.gz
insmod_ng_main: -80 bytes. Stopp mmapping, use xmalloc_open_read_close().
Diffstat (limited to 'archival/libunarchive')
-rw-r--r--archival/libunarchive/archive_xread_all_eof.c13
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 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 <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;
}