remove pad_uncompressed; unused legacy bits

SVN-Revision: 2203

diff --git a/libarchive/archive_write_private.h b/libarchive/archive_write_private.h
index f1aad29dd7192282ad4591bd4bde4f5e15c9e911..687ff67b7a66adafac560fa3a1abf2abbf0f1015 100644 (file)
--- a/libarchive/archive_write_private.h
+++ b/libarchive/archive_write_private.h
@@ -92,16 +92,6 @@ struct archive_write {
        int               bytes_per_block;
        int               bytes_in_last_block;
 
-       /*
-        * These control whether data within a gzip/bzip2 compressed
-        * stream gets padded or not.  If pad_uncompressed is set,
-        * the data will be padded to a full block before being
-        * compressed.  The pad_uncompressed_byte determines the value
-        * that will be used for padding.  Note that these have no
-        * effect on compression "none."
-        */
-       int               pad_uncompressed;
-
        /*
         * First and last write filters in the pipeline.
         */

diff --git a/libarchive/archive_write_set_format_cpio.c b/libarchive/archive_write_set_format_cpio.c
index 3295a91b41f9a5e93a59fd6a9b4069024edeb8b5..8cbef96a1f9235d0b4f0b1cdd990d7cb93878ace 100644 (file)
--- a/libarchive/archive_write_set_format_cpio.c
+++ b/libarchive/archive_write_set_format_cpio.c
@@ -99,8 +99,6 @@ archive_write_set_format_cpio(struct archive *_a)
        }
        memset(cpio, 0, sizeof(*cpio));
        a->format_data = cpio;
-
-       a->pad_uncompressed = 1;
        a->format_name = "cpio";
        a->format_write_header = archive_write_cpio_header;
        a->format_write_data = archive_write_cpio_data;

diff --git a/libarchive/archive_write_set_format_cpio_newc.c b/libarchive/archive_write_set_format_cpio_newc.c
index 9810e623c87523d499b16d0bf783efa11cd21f67..1049cb680bcc518eb4affa251773d53eba884fea 100644 (file)
--- a/libarchive/archive_write_set_format_cpio_newc.c
+++ b/libarchive/archive_write_set_format_cpio_newc.c
@@ -101,8 +101,6 @@ archive_write_set_format_cpio_newc(struct archive *_a)
        }
        memset(cpio, 0, sizeof(*cpio));
        a->format_data = cpio;
-
-       a->pad_uncompressed = 1;
        a->format_name = "cpio";
        a->format_write_header = archive_write_newc_header;
        a->format_write_data = archive_write_newc_data;

diff --git a/libarchive/archive_write_set_format_iso9660.c b/libarchive/archive_write_set_format_iso9660.c
index 97501bc619f12b81ca0f471e5ed011264290218c..c099d2a6b660841b40edc17ffe998e5b32bf697c 100644 (file)
--- a/libarchive/archive_write_set_format_iso9660.c
+++ b/libarchive/archive_write_set_format_iso9660.c
@@ -1278,8 +1278,6 @@ archive_write_set_format_iso9660(struct archive *_a)
        iso9660->primary.rootent->parent = iso9660->primary.rootent;
 
        a->format_data = iso9660;
-
-       a->pad_uncompressed = 0;
        a->format_name = "iso9660";
        a->format_options = iso9660_options;
        a->format_write_header = iso9660_write_header;

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 9a70d8aa4eb3fea159622418fd5e5592db0fe085..86446bf7ddcc6328463b9cae9e8401e62ac5cf16 100644 (file)
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -1038,8 +1038,6 @@ archive_write_set_format_mtree(struct archive *_a)
        archive_string_init(&mtree->buf);
        a->format_data = mtree;
        a->format_free = archive_write_mtree_free;
-
-       a->pad_uncompressed = 0;
        a->format_name = "mtree";
        a->format_options = archive_write_mtree_options;
        a->format_write_header = archive_write_mtree_header;

diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c
index b2b97ed889befc2617d6640fd2ebdd266669e31f..249f2b5933e61fb9d6e58fb4d0a353870cffdd2a 100644 (file)
--- a/libarchive/archive_write_set_format_pax.c
+++ b/libarchive/archive_write_set_format_pax.c
@@ -131,8 +131,6 @@ archive_write_set_format_pax(struct archive *_a)
        }
        memset(pax, 0, sizeof(*pax));
        a->format_data = pax;
-
-       a->pad_uncompressed = 1;
        a->format_name = "pax";
        a->format_write_header = archive_write_pax_header;
        a->format_write_data = archive_write_pax_data;

diff --git a/libarchive/archive_write_set_format_shar.c b/libarchive/archive_write_set_format_shar.c
index 8f55aad30c3dc1abcf0bf25ca45e7c314dc3cd84..a6452abe320055fecb2076161b35817d756061f4 100644 (file)
--- a/libarchive/archive_write_set_format_shar.c
+++ b/libarchive/archive_write_set_format_shar.c
@@ -122,8 +122,6 @@ archive_write_set_format_shar(struct archive *_a)
        archive_string_init(&shar->work);
        archive_string_init(&shar->quoted_name);
        a->format_data = shar;
-
-       a->pad_uncompressed = 0;
        a->format_name = "shar";
        a->format_write_header = archive_write_shar_header;
        a->format_close = archive_write_shar_close;

diff --git a/libarchive/archive_write_set_format_ustar.c b/libarchive/archive_write_set_format_ustar.c
index 181800362babf46527f054ab51d6c5754bfc41cf..12de03e08f4082c815e735c97ff0adc9d7174f98 100644 (file)
--- a/libarchive/archive_write_set_format_ustar.c
+++ b/libarchive/archive_write_set_format_ustar.c
@@ -182,8 +182,6 @@ archive_write_set_format_ustar(struct archive *_a)
        }
        memset(ustar, 0, sizeof(*ustar));
        a->format_data = ustar;
-
-       a->pad_uncompressed = 1;        /* Mimic gtar in this respect. */
        a->format_name = "ustar";
        a->format_write_header = archive_write_ustar_header;
        a->format_write_data = archive_write_ustar_data;

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index 97af7b3c3e7aae745574e582a71a5d3608ec3161..1090e9b8d7f6668628502b9eccb2ce8d09f0876c 100644 (file)
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -258,8 +258,6 @@ archive_write_set_format_zip(struct archive *_a)
 #endif
 
        a->format_data = zip;
-
-       a->pad_uncompressed = 0; /* Actually not needed for now, since no compression support yet. */
        a->format_name = "zip";
        a->format_options = archive_write_zip_options;
        a->format_write_header = archive_write_zip_header;