Dpkg::Compression: new API based on public functions

This API change requires lots of adjustements through the source code.

2 files changed, 8 insertions, 7 deletions

diff --git a/scripts/Dpkg/Compression/CompressedFile.pm b/scripts/Dpkg/Compression/CompressedFile.pm
index 1a85ba059..ffa471eb9 100644
--- a/scripts/Dpkg/Compression/CompressedFile.pm
+++ b/scripts/Dpkg/Compression/CompressedFile.pm
@@ -291,7 +291,7 @@ sub set_filename {
     if (defined($add_comp_ext)) {
 	*$self->{"add_comp_ext"} = $add_comp_ext;
     }
-    if (*$self->{"add_comp_ext"} and $filename =~ /\.$comp_regex$/) {
+    if (*$self->{"add_comp_ext"} and $filename =~ /\.$compression_re_file_ext$/) {
 	warning("filename %s already has an extension of a compressed file " .
 	        "and add_comp_ext is active", $filename);
     }
@@ -317,7 +317,8 @@ sub get_filename {
 	} elsif ($comp eq "none") {
 	    return *$self->{"filename"};
 	} else {
-	    return *$self->{"filename"} . "." . $comp_ext{$comp};
+	    return *$self->{"filename"} . "." .
+	           compression_get_property($comp, "file_ext");
 	}
     } else {
 	return *$self->{"filename"};
@@ -339,7 +340,7 @@ sub use_compression {
     if ($comp eq "none") {
 	return 0;
     } elsif ($comp eq "auto") {
-	$comp = get_compression_from_filename($self->get_filename());
+	$comp = compression_guess_from_filename($self->get_filename());
 	*$self->{"compressor"}->set_compression($comp) if $comp;
     }
     return $comp;
diff --git a/scripts/Dpkg/Compression/Compressor.pm b/scripts/Dpkg/Compression/Compressor.pm
index 4ca4ff454..4da35a129 100644
--- a/scripts/Dpkg/Compression/Compressor.pm
+++ b/scripts/Dpkg/Compression/Compressor.pm
@@ -32,7 +32,7 @@ our $default_compression_level = 9;
 sub set_default_compression {
     my ($self, $method) = @_;
     error(_g("%s is not a supported compression"), $method)
-	    unless $comp_supported{$method};
+	    unless compression_is_supported($method);
     $default_compression = $method;
 }
 
@@ -58,7 +58,7 @@ sub new {
 sub set_compression {
     my ($self, $method) = @_;
     error(_g("%s is not a supported compression method"), $method)
-	    unless $comp_supported{$method};
+	    unless compression_is_supported($method);
     $self->{"compression"} = $method;
 }
 
@@ -71,7 +71,7 @@ sub set_compression_level {
 
 sub get_compress_cmdline {
     my ($self) = @_;
-    my @prog = ($comp_prog{$self->{"compression"}});
+    my @prog = (compression_get_property($self->{"compression"}, "comp_prog"));
     my $level = "-" . $self->{"compression_level"};
     $level = "--" . $self->{"compression_level"}
 	    if $self->{"compression_level"} =~ m/best|fast/;
@@ -81,7 +81,7 @@ sub get_compress_cmdline {
 
 sub get_uncompress_cmdline {
     my ($self) = @_;
-    return ($comp_decomp_prog{$self->{"compression"}});
+    return (compression_get_property($self->{"compression"}, "decomp_prog"));
 }
 
 sub _sanity_check {