|
|
@@ -779,9 +779,20 @@ compressor_get_strategy(const char *name)
|
|
|
return compressor_strategy_unknown;
|
|
|
}
|
|
|
|
|
|
+static void
|
|
|
+compressor_fixup_params(struct compress_params *params)
|
|
|
+{
|
|
|
+ compressor(params->type)->fixup_params(params);
|
|
|
+
|
|
|
+ if (params->level < 0)
|
|
|
+ params->level = compressor(params->type)->default_level;
|
|
|
+}
|
|
|
+
|
|
|
bool
|
|
|
compressor_check_params(struct compress_params *params, struct dpkg_error *err)
|
|
|
{
|
|
|
+ compressor_fixup_params(params);
|
|
|
+
|
|
|
if (params->strategy == compressor_strategy_none)
|
|
|
return true;
|
|
|
|
|
|
@@ -800,12 +811,6 @@ compressor_check_params(struct compress_params *params, struct dpkg_error *err)
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
-static void
|
|
|
-compressor_fixup_params(struct compress_params *params)
|
|
|
-{
|
|
|
- compressor(params->type)->fixup_params(params);
|
|
|
-}
|
|
|
-
|
|
|
void
|
|
|
decompress_filter(enum compressor_type type, int fd_in, int fd_out,
|
|
|
const char *desc_fmt, ...)
|
|
|
@@ -831,10 +836,5 @@ compress_filter(struct compress_params *params, int fd_in, int fd_out,
|
|
|
varbuf_vprintf(&desc, desc_fmt, args);
|
|
|
va_end(args);
|
|
|
|
|
|
- compressor_fixup_params(params);
|
|
|
-
|
|
|
- if (params->level < 0)
|
|
|
- params->level = compressor(params->type)->default_level;
|
|
|
-
|
|
|
compressor(params->type)->compress(fd_in, fd_out, params, desc.buf);
|
|
|
}
|