aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/dpkg.c6
-rw-r--r--archival/gzip.c16
-rw-r--r--archival/lzop.c2
-rw-r--r--archival/tar.c14
4 files changed, 19 insertions, 19 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index dae8a9747..ed86f3355 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1026,8 +1026,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
1026 if (package_edge->type == EDGE_CONFLICTS) { 1026 if (package_edge->type == EDGE_CONFLICTS) {
1027 const unsigned package_num = 1027 const unsigned package_num =
1028 search_package_hashtable(package_edge->name, 1028 search_package_hashtable(package_edge->name,
1029 package_edge->version, 1029 package_edge->version,
1030 package_edge->operator); 1030 package_edge->operator);
1031 int result = 0; 1031 int result = 0;
1032 if (package_hashtable[package_num] != NULL) { 1032 if (package_hashtable[package_num] != NULL) {
1033 status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]); 1033 status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
@@ -1114,7 +1114,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
1114 */ 1114 */
1115 if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1) 1115 if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
1116 bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1", 1116 bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1",
1117 package_edge->type, root_of_alternatives->type); 1117 package_edge->type, root_of_alternatives->type);
1118 1118
1119 if (package_hashtable[package_num] != NULL) 1119 if (package_hashtable[package_num] != NULL)
1120 result = !package_satisfies_dependency(package_num, package_edge->type); 1120 result = !package_satisfies_dependency(package_num, package_edge->type);
diff --git a/archival/gzip.c b/archival/gzip.c
index 80db4f969..31ccab3cd 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1179,7 +1179,7 @@ static void gen_codes(ct_data * tree, int max_code)
1179 * must be all ones. 1179 * must be all ones.
1180 */ 1180 */
1181 Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1, 1181 Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
1182 "inconsistent bit counts"); 1182 "inconsistent bit counts");
1183 Tracev((stderr, "\ngen_codes: max_code %d ", max_code)); 1183 Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
1184 1184
1185 for (n = 0; n <= max_code; n++) { 1185 for (n = 0; n <= max_code; n++) {
@@ -1527,9 +1527,9 @@ static int ct_tally(int dist, int lc)
1527 } 1527 }
1528 out_length >>= 3; 1528 out_length >>= 3;
1529 Trace((stderr, 1529 Trace((stderr,
1530 "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ", 1530 "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
1531 G2.last_lit, G2.last_dist, in_length, out_length, 1531 G2.last_lit, G2.last_dist, in_length, out_length,
1532 100L - out_length * 100L / in_length)); 1532 100L - out_length * 100L / in_length));
1533 if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2) 1533 if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2)
1534 return 1; 1534 return 1;
1535 } 1535 }
@@ -1621,9 +1621,9 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
1621 static_lenb = (G2.static_len + 3 + 7) >> 3; 1621 static_lenb = (G2.static_len + 3 + 7) >> 3;
1622 1622
1623 Trace((stderr, 1623 Trace((stderr,
1624 "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ", 1624 "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
1625 opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len, 1625 opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len,
1626 G2.last_lit, G2.last_dist)); 1626 G2.last_lit, G2.last_dist));
1627 1627
1628 if (static_lenb <= opt_lenb) 1628 if (static_lenb <= opt_lenb)
1629 opt_lenb = static_lenb; 1629 opt_lenb = static_lenb;
@@ -1661,7 +1661,7 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
1661 } else { 1661 } else {
1662 send_bits((DYN_TREES << 1) + eof, 3); 1662 send_bits((DYN_TREES << 1) + eof, 3);
1663 send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1, 1663 send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1,
1664 max_blindex + 1); 1664 max_blindex + 1);
1665 compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree); 1665 compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree);
1666 G2.compressed_len += 3 + G2.opt_len; 1666 G2.compressed_len += 3 + G2.opt_len;
1667 } 1667 }
diff --git a/archival/lzop.c b/archival/lzop.c
index fbe08417d..ec4e784ed 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -350,7 +350,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
350// LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b); 350// LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b);
351 *out_len = pd(op, out); 351 *out_len = pd(op, out);
352 return (ip == ip_end ? LZO_E_OK : 352 return (ip == ip_end ? LZO_E_OK :
353 (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); 353 (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
354} 354}
355 355
356/**********************************************************************/ 356/**********************************************************************/
diff --git a/archival/tar.c b/archival/tar.c
index a3565d6ae..f46f7bb7a 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -333,13 +333,13 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
333 && (filesize <= 0x3fffffffffffffffffffffffLL) 333 && (filesize <= 0x3fffffffffffffffffffffffLL)
334#endif 334#endif
335 ) { 335 ) {
336 /* GNU tar uses "base-256 encoding" for very large numbers. 336 /* GNU tar uses "base-256 encoding" for very large numbers.
337 * Encoding is binary, with highest bit always set as a marker 337 * Encoding is binary, with highest bit always set as a marker
338 * and sign in next-highest bit: 338 * and sign in next-highest bit:
339 * 80 00 .. 00 - zero 339 * 80 00 .. 00 - zero
340 * bf ff .. ff - largest positive number 340 * bf ff .. ff - largest positive number
341 * ff ff .. ff - minus 1 341 * ff ff .. ff - minus 1
342 * c0 00 .. 00 - smallest negative number 342 * c0 00 .. 00 - smallest negative number
343 */ 343 */
344 char *p8 = header.size + sizeof(header.size); 344 char *p8 = header.size + sizeof(header.size);
345 do { 345 do {