diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
commit | e1a0d486e4804eae098571f1a6788394c2ee51ae (patch) | |
tree | c6f3435738900c8d53832eb919b1b2c3d524f2e5 /archival/libunarchive | |
parent | dd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff) | |
download | busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.bz2 busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.zip |
message string changes, mostly for consistency, also -32 bytes in .rodata
Diffstat (limited to 'archival/libunarchive')
-rw-r--r-- | archival/libunarchive/archive_xread_all_eof.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/check_header_gzip.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/decompress_unzip.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/get_header_cpio.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/get_header_tar_bz2.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/get_header_tar_gz.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/seek_by_jump.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/seek_by_read.c | 2 | ||||
-rw-r--r-- | archival/libunarchive/unpack_ar_archive.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c index e03fb0caa..8513ffecb 100644 --- a/archival/libunarchive/archive_xread_all_eof.c +++ b/archival/libunarchive/archive_xread_all_eof.c | |||
@@ -15,7 +15,7 @@ ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *b | |||
15 | 15 | ||
16 | size = full_read(archive_handle->src_fd, buf, count); | 16 | size = full_read(archive_handle->src_fd, buf, count); |
17 | if ((size != 0) && (size != count)) { | 17 | if ((size != 0) && (size != count)) { |
18 | bb_perror_msg_and_die("Short read, read %ld of %ld", (long)size, (long)count); | 18 | bb_perror_msg_and_die("short read, read %ld of %ld", (long)size, (long)count); |
19 | } | 19 | } |
20 | return(size); | 20 | return(size); |
21 | } | 21 | } |
diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c index 00d1919a7..3e42035b9 100644 --- a/archival/libunarchive/check_header_gzip.c +++ b/archival/libunarchive/check_header_gzip.c | |||
@@ -24,7 +24,7 @@ void check_header_gzip(int src_fd) | |||
24 | 24 | ||
25 | /* Check the compression method */ | 25 | /* Check the compression method */ |
26 | if (header.formatted.method != 8) { | 26 | if (header.formatted.method != 8) { |
27 | bb_error_msg_and_die("Unknown compression method %d", | 27 | bb_error_msg_and_die("unknown compression method %d", |
28 | header.formatted.method); | 28 | header.formatted.method); |
29 | } | 29 | } |
30 | 30 | ||
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 27b4ddbcf..9e3e98dd5 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
@@ -745,7 +745,7 @@ static int inflate_block(int *e) | |||
745 | 745 | ||
746 | if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { | 746 | if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { |
747 | if (i == 1) { | 747 | if (i == 1) { |
748 | bb_error_msg_and_die("Incomplete literal tree"); | 748 | bb_error_msg_and_die("incomplete literal tree"); |
749 | huft_free(tl); | 749 | huft_free(tl); |
750 | } | 750 | } |
751 | return i; /* incomplete code set */ | 751 | return i; /* incomplete code set */ |
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index 56862f137..dd48cb09b 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c | |||
@@ -57,7 +57,7 @@ char get_header_cpio(archive_handle_t *archive_handle) | |||
57 | archive_handle->offset += 110; | 57 | archive_handle->offset += 110; |
58 | 58 | ||
59 | if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) { | 59 | if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) { |
60 | bb_error_msg_and_die("Unsupported cpio format, use newc or crc"); | 60 | bb_error_msg_and_die("unsupported cpio format, use newc or crc"); |
61 | } | 61 | } |
62 | 62 | ||
63 | { | 63 | { |
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c index e3cb328fc..e7a80fc41 100644 --- a/archival/libunarchive/get_header_tar_bz2.c +++ b/archival/libunarchive/get_header_tar_bz2.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | char get_header_tar_bz2(archive_handle_t *archive_handle) | 16 | char get_header_tar_bz2(archive_handle_t *archive_handle) |
17 | { | 17 | { |
18 | /* Cant lseek over pipe's */ | 18 | /* Can't lseek over pipes */ |
19 | archive_handle->seek = seek_by_read; | 19 | archive_handle->seek = seek_by_read; |
20 | 20 | ||
21 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompressStream); | 21 | archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompressStream); |
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c index af059a187..41c02e16a 100644 --- a/archival/libunarchive/get_header_tar_gz.c +++ b/archival/libunarchive/get_header_tar_gz.c | |||
@@ -12,7 +12,7 @@ char get_header_tar_gz(archive_handle_t *archive_handle) | |||
12 | { | 12 | { |
13 | unsigned char magic[2]; | 13 | unsigned char magic[2]; |
14 | 14 | ||
15 | /* Cant lseek over pipe's */ | 15 | /* Can't lseek over pipes */ |
16 | archive_handle->seek = seek_by_read; | 16 | archive_handle->seek = seek_by_read; |
17 | 17 | ||
18 | xread(archive_handle->src_fd, &magic, 2); | 18 | xread(archive_handle->src_fd, &magic, 2); |
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c index e1917dd2a..d605f61dd 100644 --- a/archival/libunarchive/seek_by_jump.c +++ b/archival/libunarchive/seek_by_jump.c | |||
@@ -19,6 +19,6 @@ void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amo | |||
19 | seek_by_read(archive_handle, amount); | 19 | seek_by_read(archive_handle, amount); |
20 | } else | 20 | } else |
21 | #endif | 21 | #endif |
22 | bb_perror_msg_and_die("Seek failure"); | 22 | bb_perror_msg_and_die("seek failure"); |
23 | } | 23 | } |
24 | } | 24 | } |
diff --git a/archival/libunarchive/seek_by_read.c b/archival/libunarchive/seek_by_read.c index 03cbb9ecc..d56f94b21 100644 --- a/archival/libunarchive/seek_by_read.c +++ b/archival/libunarchive/seek_by_read.c | |||
@@ -8,7 +8,7 @@ | |||
8 | #include "unarchive.h" | 8 | #include "unarchive.h" |
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | /* If we are reading through a pipe(), or from stdin then we cant lseek, | 11 | /* If we are reading through a pipe(), or from stdin then we can't lseek, |
12 | * we must read and discard the data to skip over it. | 12 | * we must read and discard the data to skip over it. |
13 | */ | 13 | */ |
14 | void seek_by_read(const archive_handle_t *archive_handle, const unsigned int jump_size) | 14 | void seek_by_read(const archive_handle_t *archive_handle, const unsigned int jump_size) |
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c index eed528391..6a84ae811 100644 --- a/archival/libunarchive/unpack_ar_archive.c +++ b/archival/libunarchive/unpack_ar_archive.c | |||
@@ -14,7 +14,7 @@ void unpack_ar_archive(archive_handle_t *ar_archive) | |||
14 | 14 | ||
15 | xread(ar_archive->src_fd, magic, 7); | 15 | xread(ar_archive->src_fd, magic, 7); |
16 | if (strncmp(magic, "!<arch>", 7) != 0) { | 16 | if (strncmp(magic, "!<arch>", 7) != 0) { |
17 | bb_error_msg_and_die("Invalid ar magic"); | 17 | bb_error_msg_and_die("invalid ar magic"); |
18 | } | 18 | } |
19 | ar_archive->offset += 7; | 19 | ar_archive->offset += 7; |
20 | 20 | ||