diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-08 11:24:44 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-08 11:24:44 +0200 |
| commit | 7f3a2a22569eb8e4c9fcc1c7f4e51fe0c6155dae (patch) | |
| tree | ca48b19046a8de875054b240f7713a09cb9a5358 /archival | |
| parent | d60752f8c9be5689a249ad518deb38061d4bc45e (diff) | |
| download | busybox-7f3a2a22569eb8e4c9fcc1c7f4e51fe0c6155dae.tar.gz | |
join some common strings, -400 bytes
function old new delta
print_intel_cstates 499 511 +12
file_insert 355 364 +9
dpkg_main 2944 2940 -4
ifenslave_main 645 640 -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 21/-9) Total: 12 bytes
text data bss dec hex filename
937564 932 17676 956172 e970c busybox_old
937164 932 17676 955772 e957c busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/dpkg.c | 8 | ||||
| -rw-r--r-- | archival/libarchive/data_extract_to_command.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index 151f0ca43..df7a0db64 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -1151,13 +1151,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count if (result && number_of_alternatives == 0) { if (root_of_alternatives) bb_error_msg_and_die( - "package %s %sdepends on %s, " - "which cannot be satisfied", + "package %s %sdepends on %s, which %s", name_hashtable[package_node->name], package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "", - name_hashtable[root_of_alternatives->name]); + name_hashtable[root_of_alternatives->name], + "cannot be satisfied"); bb_error_msg_and_die( - "package %s %sdepends on %s, which %s\n", + "package %s %sdepends on %s, which %s", name_hashtable[package_node->name], package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "", name_hashtable[package_edge->name], diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c index 5b32c2ec8..6f5317a0e 100644 --- a/archival/libarchive/data_extract_to_command.c +++ b/archival/libarchive/data_extract_to_command.c @@ -118,7 +118,7 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle) bb_error_msg_and_die("'%s' returned status %d", archive_handle->tar__to_command, WEXITSTATUS(status)); if (WIFSIGNALED(status)) - bb_error_msg_and_die("'%s' terminated on signal %d", + bb_error_msg_and_die("'%s' terminated by signal %d", archive_handle->tar__to_command, WTERMSIG(status)); if (!BB_MMU) { |