m->verity = root_hash && verity_data;
m->can_verity = !!verity_data;
- options = mount_options_from_part(mount_options, PARTITION_ROOT);
+ options = mount_options_from_designator(mount_options, PARTITION_ROOT);
if (options) {
o = strdup(options);
if (!o)
if (!n)
return -ENOMEM;
- options = mount_options_from_part(mount_options, designator);
+ options = mount_options_from_designator(mount_options, designator);
if (options) {
o = strdup(options);
if (!o)
if (!n)
return -ENOMEM;
- options = mount_options_from_part(mount_options, PARTITION_XBOOTLDR);
+ options = mount_options_from_designator(mount_options, PARTITION_XBOOTLDR);
if (options) {
o = strdup(options);
if (!o)
if (multiple_generic)
return -ENOTUNIQ;
- options = mount_options_from_part(mount_options, PARTITION_ROOT);
+ options = mount_options_from_designator(mount_options, PARTITION_ROOT);
if (options) {
o = strdup(options);
if (!o)
return NULL;
}
-const char* mount_options_from_part(const MountOptions *options, int designator) {
- MountOptions *m;
+const char* mount_options_from_designator(const MountOptions *options, int designator) {
+ const MountOptions *m;
- LIST_FOREACH(mount_options, m, (MountOptions *)options)
+ LIST_FOREACH(mount_options, m, options)
if (designator == m->partition_designator && !isempty(m->options))
return m->options;
MountOptions* mount_options_free_all(MountOptions *options);
DEFINE_TRIVIAL_CLEANUP_FUNC(MountOptions*, mount_options_free_all);
-const char* mount_options_from_part(const MountOptions *options, int designator);
+const char* mount_options_from_designator(const MountOptions *options, int designator);
int probe_filesystem(const char *node, char **ret_fstype);
int dissect_image(int fd, const void *root_hash, size_t root_hash_size, const char *verity_data, const MountOptions *mount_options, DissectImageFlags flags, DissectedImage **ret);