From d267d86f6e24c4f947c30c1a3642d57b82f8addd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 28 Sep 2013 18:43:30 +0200 Subject: Replace lzma with xz. Tweaks to fix debug builds. --- depends/pack200/src/bands.cpp | 8 -------- depends/pack200/src/unpack.cpp | 7 ------- 2 files changed, 15 deletions(-) (limited to 'depends/pack200') diff --git a/depends/pack200/src/bands.cpp b/depends/pack200/src/bands.cpp index 41547ad1..6b4e8971 100644 --- a/depends/pack200/src/bands.cpp +++ b/depends/pack200/src/bands.cpp @@ -93,13 +93,6 @@ void band::readData(int expectedLength) { // must be a variable-length coding assert(defc->B() > 1 && defc->L() > 0); - // must have already read from previous band: - assert(bn >= BAND_LIMIT || bn <= 0 || bn == e_cp_Utf8_big_chars || - endsWith(name, "_lo") // preceded by _hi conditional band - || - bn == e_file_options // preceded by conditional band - || - u->rp == u->all_bands[bn - 1].maxRP() || u->all_bands[bn - 1].defc == nullptr); value_stream xvs; coding *valc = defc; @@ -425,7 +418,6 @@ band *band::makeBands(unpacker *u) coding *defc = coding::findBySpec(bi.defc); assert((defc == nullptr) == (bi.defc == -1)); // no garbage, please assert(defc == nullptr || !defc->isMalloc); - assert(bi.bn == i); // band array consistent w/ band enum b.init(u, i, defc); if (bi.index > 0) { diff --git a/depends/pack200/src/unpack.cpp b/depends/pack200/src/unpack.cpp index 722d67b5..a562d442 100644 --- a/depends/pack200/src/unpack.cpp +++ b/depends/pack200/src/unpack.cpp @@ -2369,13 +2369,11 @@ void unpacker::read_attrs(int attrc, int obj_count) bool haveLongFlags = ad.haveLongFlags(); band &xxx_flags_hi = ad.xxx_flags_hi(); - assert(endsWith(xxx_flags_hi.name, "_flags_hi")); if (haveLongFlags) xxx_flags_hi.readData(obj_count); CHECK; band &xxx_flags_lo = ad.xxx_flags_lo(); - assert(endsWith(xxx_flags_lo.name, "_flags_lo")); xxx_flags_lo.readData(obj_count); CHECK; @@ -2400,13 +2398,11 @@ void unpacker::read_attrs(int attrc, int obj_count) xxx_flags_hi.rewind(); band &xxx_attr_count = ad.xxx_attr_count(); - assert(endsWith(xxx_attr_count.name, "_attr_count")); // There is one count element for each 1<<16 bit set in flags: xxx_attr_count.readData(ad.predefCount(X_ATTR_OVERFLOW)); CHECK; band &xxx_attr_indexes = ad.xxx_attr_indexes(); - assert(endsWith(xxx_attr_indexes.name, "_attr_indexes")); int overflowIndexCount = xxx_attr_count.getIntTotal(); xxx_attr_indexes.readData(overflowIndexCount); CHECK; @@ -4637,9 +4633,6 @@ void unpacker::write_members(int num, int attrc) band &member_flags_hi = ad.xxx_flags_hi(); band &member_flags_lo = ad.xxx_flags_lo(); band &member_descr = (&member_flags_hi)[e_field_descr - e_field_flags_hi]; - assert(endsWith(member_descr.name, "_descr")); - assert(endsWith(member_flags_lo.name, "_flags_lo")); - assert(endsWith(member_flags_lo.name, "_flags_lo")); bool haveLongFlags = ad.haveLongFlags(); putu2(num); -- cgit v1.2.3