aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-09-06 19:02:46 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-09-06 19:02:46 +0000
commit6d655be5df5a559253a3769f294a6255535ad3fd (patch)
tree4342fd4f88b84459ef5c2c2c2c6fb86863a7112f /archival
parent3538b9a8822421b7c8596a33a917dcf2f99c92b7 (diff)
downloadbusybox-w32-6d655be5df5a559253a3769f294a6255535ad3fd.tar.gz
busybox-w32-6d655be5df5a559253a3769f294a6255535ad3fd.tar.bz2
busybox-w32-6d655be5df5a559253a3769f294a6255535ad3fd.zip
removed a lot of trailing \n in bb_msg() calls. It is added
automatically by function itself.
Diffstat (limited to 'archival')
-rw-r--r--archival/dpkg.c6
-rw-r--r--archival/libunarchive/decompress_unzip.c2
-rw-r--r--archival/libunarchive/get_header_cpio.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 98f4f9725..163d91f19 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -492,7 +492,7 @@ static void add_split_dependencies(common_node_t *parent_node, const char *whole
492 else if (strncmp(version, ">=", offset_ch) == 0) { 492 else if (strncmp(version, ">=", offset_ch) == 0) {
493 edge->operator = VER_MORE_EQUAL; 493 edge->operator = VER_MORE_EQUAL;
494 } else { 494 } else {
495 bb_error_msg_and_die("Illegal operator\n"); 495 bb_error_msg_and_die("Illegal operator");
496 } 496 }
497 } 497 }
498 /* skip to start of version numbers */ 498 /* skip to start of version numbers */
@@ -1136,7 +1136,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
1136 * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1 1136 * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1
1137 */ 1137 */
1138 if ( root_of_alternatives && package_edge->type != root_of_alternatives->type - 1) 1138 if ( root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
1139 bb_error_msg_and_die("Fatal error. Package dependencies corrupt: %d != %d - 1 \n", 1139 bb_error_msg_and_die("Fatal error. Package dependencies corrupt: %d != %d - 1",
1140 package_edge->type, root_of_alternatives->type); 1140 package_edge->type, root_of_alternatives->type);
1141 1141
1142 if (package_hashtable[package_num] != NULL) 1142 if (package_hashtable[package_num] != NULL)
@@ -1718,7 +1718,7 @@ int dpkg_main(int argc, char **argv)
1718 search_name_hashtable(argv[optind]), 1718 search_name_hashtable(argv[optind]),
1719 search_name_hashtable("ANY"), VER_ANY); 1719 search_name_hashtable("ANY"), VER_ANY);
1720 if (package_hashtable[deb_file[deb_count]->package] == NULL) { 1720 if (package_hashtable[deb_file[deb_count]->package] == NULL) {
1721 bb_error_msg_and_die("Package %s is uninstalled or unknown\n", argv[optind]); 1721 bb_error_msg_and_die("Package %s is uninstalled or unknown", argv[optind]);
1722 } 1722 }
1723 package_num = deb_file[deb_count]->package; 1723 package_num = deb_file[deb_count]->package;
1724 status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]); 1724 status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 7362da8c2..c0203cc4a 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -770,7 +770,7 @@ static int inflate_block(int *e)
770 } 770 }
771 default: 771 default:
772 /* bad block type */ 772 /* bad block type */
773 bb_error_msg_and_die("bad block type %d\n", t); 773 bb_error_msg_and_die("bad block type %d", t);
774 } 774 }
775} 775}
776 776
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c
index d405d0e1b..bc766c6aa 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -31,7 +31,7 @@ char get_header_cpio(archive_handle_t *archive_handle)
31 oldtmp = NULL; 31 oldtmp = NULL;
32 32
33 while (tmp) { 33 while (tmp) {
34 bb_error_msg_and_die("need to fix this\n"); 34 bb_error_msg_and_die("need to fix this");
35 if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */ 35 if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
36 file_header = tmp->entry; 36 file_header = tmp->entry;
37 if (oldtmp) { 37 if (oldtmp) {