X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=cc8d0e2073336cb8fa7957d786908861e26ad258;hb=ccfc8894570ac542d2d38e6d4fa478968213f35d;hp=0e6197309e484cb46dc0c00651084188de591e99;hpb=672dbeabbf152aefb1d8a7211d3c8a1feb3e1e51;p=wimlib

diff --git a/programs/imagex.c b/programs/imagex.c
index 0e619730..cc8d0e20 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -149,7 +149,6 @@ enum {
 	IMAGEX_COMMIT_OPTION,
 	IMAGEX_COMPACT_OPTION,
 	IMAGEX_COMPRESS_OPTION,
-	IMAGEX_COMPRESS_SLOW_OPTION,
 	IMAGEX_CONFIG_OPTION,
 	IMAGEX_DEBUG_OPTION,
 	IMAGEX_DELTA_FROM_OPTION,
@@ -226,14 +225,10 @@ static const struct option capture_or_append_options[] = {
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
-	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
 	{T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
 	{T("solid"),       no_argument,      NULL, IMAGEX_SOLID_OPTION},
-	{T("pack-streams"), no_argument,      NULL, IMAGEX_SOLID_OPTION},
 	{T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
-	{T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
 	{T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
-	{T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
 	{T("no-solid-sort"), no_argument,     NULL, IMAGEX_NO_SOLID_SORT_OPTION},
 	{T("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
 	{T("dereference"), no_argument,       NULL, IMAGEX_DEREFERENCE_OPTION},
@@ -281,14 +276,10 @@ static const struct option export_options[] = {
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("recompress"),  no_argument,       NULL, IMAGEX_RECOMPRESS_OPTION},
-	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
 	{T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
 	{T("solid"),       no_argument,       NULL, IMAGEX_SOLID_OPTION},
-	{T("pack-streams"),no_argument,       NULL, IMAGEX_SOLID_OPTION},
 	{T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
-	{T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
 	{T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
-	{T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
 	{T("no-solid-sort"), no_argument,     NULL, IMAGEX_NO_SOLID_SORT_OPTION},
 	{T("ref"),         required_argument, NULL, IMAGEX_REF_OPTION},
 	{T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
@@ -330,7 +321,6 @@ static const struct option info_options[] = {
 	{T("header"),       no_argument,       NULL, IMAGEX_HEADER_OPTION},
 	{T("lookup-table"), no_argument,       NULL, IMAGEX_BLOBS_OPTION},
 	{T("blobs"),        no_argument,       NULL, IMAGEX_BLOBS_OPTION},
-	{T("metadata"),     no_argument,       NULL, IMAGEX_METADATA_OPTION},
 	{T("xml"),          no_argument,       NULL, IMAGEX_XML_OPTION},
 	{T("image-property"), required_argument, NULL, IMAGEX_IMAGE_PROPERTY_OPTION},
 	{NULL, 0, NULL, 0},
@@ -358,15 +348,10 @@ static const struct option optimize_options[] = {
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("recompress"),  no_argument,       NULL, IMAGEX_RECOMPRESS_OPTION},
-	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
-	{T("recompress-slow"), no_argument,   NULL, IMAGEX_COMPRESS_SLOW_OPTION},
 	{T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
 	{T("solid"),       no_argument,       NULL, IMAGEX_SOLID_OPTION},
-	{T("pack-streams"),no_argument,       NULL, IMAGEX_SOLID_OPTION},
 	{T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
-	{T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION},
 	{T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
-	{T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION},
 	{T("no-solid-sort"), no_argument,     NULL, IMAGEX_NO_SOLID_SORT_OPTION},
 	{T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
 	{T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
@@ -601,16 +586,6 @@ set_compact_mode(const tchar *arg, int *extract_flags)
 }
 
 
-static void
-set_compress_slow(void)
-{
-#if 0
-	fprintf(stderr, "WARNING: the '--compress-slow' option is deprecated.\n"
-		        "         Use the '--compress=TYPE:LEVEL' option instead.\n");
-#endif
-	wimlib_set_default_compression_level(-1, 100);
-}
-
 struct string_set {
 	tchar **strings;
 	unsigned num_strings;
@@ -1914,9 +1889,6 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
 				goto out_err;
 			break;
-		case IMAGEX_COMPRESS_SLOW_OPTION:
-			set_compress_slow();
-			break;
 		case IMAGEX_CHUNK_SIZE_OPTION:
 			chunk_size = parse_chunk_size(optarg);
 			if (chunk_size == UINT32_MAX)
@@ -2876,10 +2848,6 @@ imagex_export(int argc, tchar **argv, int cmd)
 			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
 				goto out_err;
 			break;
-		case IMAGEX_COMPRESS_SLOW_OPTION:
-			set_compress_slow();
-			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
-			break;
 		case IMAGEX_RECOMPRESS_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
 			break;
@@ -3370,10 +3338,6 @@ imagex_info(int argc, tchar **argv, int cmd)
 			xml_out_file = optarg;
 			short_header = false;
 			break;
-		case IMAGEX_METADATA_OPTION:
-			imagex_error(T("The --metadata option has been removed. "
-				       "Use 'wimdir --detail' instead."));
-			goto out_err;
 		case IMAGEX_IMAGE_PROPERTY_OPTION:
 			ret = append_image_property_argument(&image_properties);
 			if (ret)
@@ -3790,10 +3754,6 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
 				goto out_err;
 			break;
-		case IMAGEX_COMPRESS_SLOW_OPTION:
-			set_compress_slow();
-			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
-			break;
 		case IMAGEX_RECOMPRESS_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
 			break;