diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-02 12:57:26 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-02 12:57:26 +0200 |
commit | ea8b252cb30c4b4463df43a5342af95931920f09 (patch) | |
tree | b32f4cfd202c9b98cbb2a59bb5a629275e1b4119 /archival | |
parent | 8837c5dec402fd6782589c0a676bc7f90dea4061 (diff) | |
download | busybox-w32-ea8b252cb30c4b4463df43a5342af95931920f09.tar.gz busybox-w32-ea8b252cb30c4b4463df43a5342af95931920f09.tar.bz2 busybox-w32-ea8b252cb30c4b4463df43a5342af95931920f09.zip |
*: 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 f1c84d681..fdb8b9306 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 | |||
88 | if (n2 != n) { | 88 | if (n2 != n) { |
89 | if (n2 >= 0) | 89 | if (n2 >= 0) |
90 | errno = 0; /* prevent bogus error message */ | 90 | errno = 0; /* prevent bogus error message */ |
91 | bb_perror_msg(n2 >= 0 ? "short write" : "write error"); | 91 | bb_perror_msg(n2 >= 0 ? "short write" : bb_msg_write_error); |
92 | return -1; | 92 | return -1; |
93 | } | 93 | } |
94 | } | 94 | } |
@@ -118,7 +118,7 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA | |||
118 | while (1) { | 118 | while (1) { |
119 | count = full_read(STDIN_FILENO, rbuf, IOBUF_SIZE); | 119 | count = full_read(STDIN_FILENO, rbuf, IOBUF_SIZE); |
120 | if (count < 0) { | 120 | if (count < 0) { |
121 | bb_perror_msg("read error"); | 121 | bb_perror_msg(bb_msg_read_error); |
122 | total = -1; | 122 | total = -1; |
123 | break; | 123 | break; |
124 | } | 124 | } |
diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libunarchive/decompress_unxz.c index 3f9392984..1302e29fb 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) | |||
86 | if (rd) { | 86 | if (rd) { |
87 | rd = safe_read(src_fd, membuf + insz, rd); | 87 | rd = safe_read(src_fd, membuf + insz, rd); |
88 | if (rd < 0) { | 88 | if (rd < 0) { |
89 | bb_error_msg("read error"); | 89 | bb_error_msg(bb_msg_read_error); |
90 | total = -1; | 90 | total = -1; |
91 | break; | 91 | break; |
92 | } | 92 | } |
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 33e877ec8..bccd0262e 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) | |||
1072 | bytebuffer_offset = 0; | 1072 | bytebuffer_offset = 0; |
1073 | bytebuffer_size = full_read(gunzip_src_fd, &bytebuffer[count], bytebuffer_max - count); | 1073 | bytebuffer_size = full_read(gunzip_src_fd, &bytebuffer[count], bytebuffer_max - count); |
1074 | if ((int)bytebuffer_size < 0) { | 1074 | if ((int)bytebuffer_size < 0) { |
1075 | bb_error_msg("read error"); | 1075 | bb_error_msg(bb_msg_read_error); |
1076 | return 0; | 1076 | return 0; |
1077 | } | 1077 | } |
1078 | bytebuffer_size += count; | 1078 | bytebuffer_size += count; |