dissect: add DISSECT_IMAGE_DISCARD_ANY mask
This makes the code to set arg_flags much more readable.
This commit is contained in:
parent
58abb66f4b
commit
971e2ef0cb
|
@ -95,21 +95,25 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
arg_flags |= DISSECT_IMAGE_READ_ONLY;
|
||||
break;
|
||||
|
||||
case ARG_DISCARD:
|
||||
case ARG_DISCARD: {
|
||||
DissectImageFlags flags;
|
||||
|
||||
if (streq(optarg, "disabled"))
|
||||
arg_flags &= ~(DISSECT_IMAGE_DISCARD_ON_LOOP|DISSECT_IMAGE_DISCARD|DISSECT_IMAGE_DISCARD_ON_CRYPTO);
|
||||
flags = 0;
|
||||
else if (streq(optarg, "loop"))
|
||||
arg_flags = (arg_flags & ~(DISSECT_IMAGE_DISCARD|DISSECT_IMAGE_DISCARD_ON_CRYPTO)) | DISSECT_IMAGE_DISCARD_ON_LOOP;
|
||||
flags = DISSECT_IMAGE_DISCARD_ON_LOOP;
|
||||
else if (streq(optarg, "all"))
|
||||
arg_flags = (arg_flags & ~(DISSECT_IMAGE_DISCARD_ON_CRYPTO)) | DISSECT_IMAGE_DISCARD_ON_LOOP | DISSECT_IMAGE_DISCARD;
|
||||
flags = DISSECT_IMAGE_DISCARD_ON_LOOP | DISSECT_IMAGE_DISCARD;
|
||||
else if (streq(optarg, "crypt"))
|
||||
arg_flags |= DISSECT_IMAGE_DISCARD_ON_LOOP | DISSECT_IMAGE_DISCARD | DISSECT_IMAGE_DISCARD_ON_CRYPTO;
|
||||
flags = DISSECT_IMAGE_DISCARD_ANY;
|
||||
else {
|
||||
log_error("Unknown --discard= parameter: %s", optarg);
|
||||
return -EINVAL;
|
||||
}
|
||||
arg_flags = (arg_flags & ~DISSECT_IMAGE_DISCARD_ANY) | flags;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case ARG_ROOT_HASH: {
|
||||
void *p;
|
||||
|
|
|
@ -61,9 +61,12 @@ static inline int PARTITION_VERITY_OF(int p) {
|
|||
|
||||
typedef enum DissectImageFlags {
|
||||
DISSECT_IMAGE_READ_ONLY = 1,
|
||||
DISSECT_IMAGE_DISCARD_ON_LOOP = 2, /* Turn on "discard" if on loop device and file system supports it */
|
||||
DISSECT_IMAGE_DISCARD_ON_LOOP = 2, /* Turn on "discard" if on a loop device and file system supports it */
|
||||
DISSECT_IMAGE_DISCARD = 4, /* Turn on "discard" if file system supports it, on all block devices */
|
||||
DISSECT_IMAGE_DISCARD_ON_CRYPTO = 8, /* Turn on "discard" also on crypto devices */
|
||||
DISSECT_IMAGE_DISCARD_ANY = DISSECT_IMAGE_DISCARD_ON_LOOP |
|
||||
DISSECT_IMAGE_DISCARD |
|
||||
DISSECT_IMAGE_DISCARD_ON_CRYPTO,
|
||||
} DissectImageFlags;
|
||||
|
||||
struct DissectedImage {
|
||||
|
|
Loading…
Reference in New Issue