From e1a0d486e4804eae098571f1a6788394c2ee51ae Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 20 Oct 2006 13:28:22 +0000 Subject: message string changes, mostly for consistency, also -32 bytes in .rodata --- archival/libunarchive/archive_xread_all_eof.c | 2 +- archival/libunarchive/check_header_gzip.c | 2 +- archival/libunarchive/decompress_unzip.c | 2 +- archival/libunarchive/get_header_cpio.c | 2 +- archival/libunarchive/get_header_tar_bz2.c | 2 +- archival/libunarchive/get_header_tar_gz.c | 2 +- archival/libunarchive/seek_by_jump.c | 2 +- archival/libunarchive/seek_by_read.c | 2 +- archival/libunarchive/unpack_ar_archive.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'archival/libunarchive') 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 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); + bb_perror_msg_and_die("short read, read %ld of %ld", (long)size, (long)count); } return(size); } 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) /* Check the compression method */ if (header.formatted.method != 8) { - bb_error_msg_and_die("Unknown compression method %d", + bb_error_msg_and_die("unknown compression method %d", header.formatted.method); } 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) if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { if (i == 1) { - bb_error_msg_and_die("Incomplete literal tree"); + bb_error_msg_and_die("incomplete literal tree"); huft_free(tl); } 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) archive_handle->offset += 110; if ((strncmp(&cpio_header[0], "07070", 5) != 0) || ((cpio_header[5] != '1') && (cpio_header[5] != '2'))) { - bb_error_msg_and_die("Unsupported cpio format, use newc or crc"); + bb_error_msg_and_die("unsupported cpio format, use newc or crc"); } { 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 @@ char get_header_tar_bz2(archive_handle_t *archive_handle) { - /* Cant lseek over pipe's */ + /* Can't lseek over pipes */ archive_handle->seek = seek_by_read; 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) { unsigned char magic[2]; - /* Cant lseek over pipe's */ + /* Can't lseek over pipes */ archive_handle->seek = seek_by_read; 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 seek_by_read(archive_handle, amount); } else #endif - bb_perror_msg_and_die("Seek failure"); + bb_perror_msg_and_die("seek failure"); } } 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 @@ #include "unarchive.h" #include "libbb.h" -/* If we are reading through a pipe(), or from stdin then we cant lseek, +/* If we are reading through a pipe(), or from stdin then we can't lseek, * we must read and discard the data to skip over it. */ 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) xread(ar_archive->src_fd, magic, 7); if (strncmp(magic, "!", 7) != 0) { - bb_error_msg_and_die("Invalid ar magic"); + bb_error_msg_and_die("invalid ar magic"); } ar_archive->offset += 7; -- cgit v1.2.3