diff options
| author | Denys Vlasenko | 2010-06-02 12:57:26 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-06-02 12:57:26 +0200 |
| commit | ea8b252cb30c4b4463df43a5342af95931920f09 (patch) | |
| tree | b32f4cfd202c9b98cbb2a59bb5a629275e1b4119 /archival | |
| parent | 8837c5dec402fd6782589c0a676bc7f90dea4061 (diff) | |
| download | busybox-ea8b252cb30c4b4463df43a5342af95931920f09.zip busybox-ea8b252cb30c4b4463df43a5342af95931920f09.tar.gz | |
*: better string sharing
text data bss dec hex filename
849427 441 7556 857424 d1550 busybox_old
849355 441 7556 857352 d1508 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/bzip2.c | 4 | ||||
| -rw-r--r-- | archival/libunarchive/decompress_unxz.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/decompress_unzip.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/archival/bzip2.c b/archival/bzip2.c index f1c84d6..fdb8b93 100644 --- a/archival/bzip2.c +++ b/archival/bzip2.c @@ -88,7 +88,7 @@ IF_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, vo if (n2 != n) { if (n2 >= 0) errno = 0; /* prevent bogus error message */ - bb_perror_msg(n2 >= 0 ? "short write" : "write error"); + bb_perror_msg(n2 >= 0 ? "short write" : bb_msg_write_error); return -1; } } @@ -118,7 +118,7 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA while (1) { count = full_read(STDIN_FILENO, rbuf, IOBUF_SIZE); if (count < 0) { - bb_perror_msg("read error"); + bb_perror_msg(bb_msg_read_error); total = -1; break; } diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libunarchive/decompress_unxz.c index 3f93929..1302e29 100644 --- a/archival/libunarchive/decompress_unxz.c +++ b/archival/libunarchive/decompress_unxz.c @@ -86,7 +86,7 @@ unpack_xz_stream(int src_fd, int dst_fd) if (rd) { rd = safe_read(src_fd, membuf + insz, rd); if (rd < 0) { - bb_error_msg("read error"); + bb_error_msg(bb_msg_read_error); total = -1; break; } diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 33e877e..bccd026 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c @@ -1072,7 +1072,7 @@ static int top_up(STATE_PARAM unsigned n) bytebuffer_offset = 0; bytebuffer_size = full_read(gunzip_src_fd, &bytebuffer[count], bytebuffer_max - count); if ((int)bytebuffer_size < 0) { - bb_error_msg("read error"); + bb_error_msg(bb_msg_read_error); return 0; } bytebuffer_size += count; |