diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-11-24 10:05:32 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-11-29 10:08:51 +0100 |
| commit | 448cfb7f3763a50ef2e911668d45d3f215f8be16 (patch) | |
| tree | 9ad175852fb3300e75fbe112e65d8c6966d61d1a /src/partition | |
| parent | ea09f92ce41e3304e6341df8d6ad5ca25ac81cf1 (diff) | |
| download | systemd-448cfb7f3763a50ef2e911668d45d3f215f8be16.tar.gz | |
repart: Inline Partition and Context typedefs
Diffstat (limited to 'src/partition')
| -rw-r--r-- | src/partition/repart.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/partition/repart.c b/src/partition/repart.c index 26f1519edc..e3d9e4f661 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -158,9 +158,7 @@ STATIC_DESTRUCTOR_REGISTER(arg_tpm2_device, freep); STATIC_DESTRUCTOR_REGISTER(arg_tpm2_public_key, freep); STATIC_DESTRUCTOR_REGISTER(arg_filter_partitions, freep); -typedef struct Partition Partition; typedef struct FreeArea FreeArea; -typedef struct Context Context; typedef enum EncryptMode { ENCRYPT_OFF, @@ -180,7 +178,7 @@ typedef enum VerityMode { _VERITY_MODE_INVALID = -EINVAL, } VerityMode; -struct Partition { +typedef struct Partition { char *definition_path; char **drop_in_files; @@ -236,10 +234,10 @@ struct Partition { char *split_name_format; char *split_path; - Partition *siblings[_VERITY_MODE_MAX]; + struct Partition *siblings[_VERITY_MODE_MAX]; - LIST_FIELDS(Partition, partitions); -}; + LIST_FIELDS(struct Partition, partitions); +} Partition; #define PARTITION_IS_FOREIGN(p) (!(p)->definition_path) #define PARTITION_EXISTS(p) (!!(p)->current_partition) @@ -250,7 +248,7 @@ struct FreeArea { uint64_t allocated; }; -struct Context { +typedef struct Context { LIST_HEAD(Partition, partitions); size_t n_partitions; @@ -269,7 +267,7 @@ struct Context { int backing_fd; bool from_scratch; -}; +} Context; static const char *encrypt_mode_table[_ENCRYPT_MODE_MAX] = { [ENCRYPT_OFF] = "off", |