picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dissect: rename mount_options_from_part() → mount_options_from_designator() 

After all, it actually takes a designator argument, not a partition
index or so.
This commit is contained in:
Lennart Poettering 2020-09-15 18:02:28 +02:00
parent 80dd1125c8
commit f5215bc8d3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/dissect-image.c
View File

@ -420,7 +420,7 @@ int dissect_image(
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)
@ -716,7 +716,7 @@ int dissect_image(
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)
@ -773,7 +773,7 @@ int dissect_image(
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)
@ -827,7 +827,7 @@ int dissect_image(
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)
@ -2068,10 +2068,10 @@ MountOptions* mount_options_free_all(MountOptions *options) {
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;

2
src/shared/dissect-image.h
View File

@ -94,7 +94,7 @@ struct MountOptions {
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);