diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-05-19 17:48:33 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-05-26 17:10:54 +0200 |
| commit | 92a08691c21a2472fe00c441aa7ed553b9c93dbb (patch) | |
| tree | 8108feb5f2365697d76567a7a0c075069e6ddf04 /src/shared/fstab-util.c | |
| parent | Merge pull request #15906 from keszybz/busctl-stdout-stderr (diff) | |
| download | systemd-92a08691c21a2472fe00c441aa7ed553b9c93dbb.tar.xz systemd-92a08691c21a2472fe00c441aa7ed553b9c93dbb.zip | |
fstab-util: prefix return parameters with ret_
Diffstat (limited to 'src/shared/fstab-util.c')
| -rw-r--r-- | src/shared/fstab-util.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c index b19127be09..806dda8475 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -80,7 +80,7 @@ int fstab_is_mount_point(const char *mount) { } int fstab_filter_options(const char *opts, const char *names, - const char **namefound, char **value, char **filtered) { + const char **ret_namefound, char **ret_value, char **ret_filtered) { const char *name, *n = NULL, *x; _cleanup_strv_free_ char **stor = NULL; _cleanup_free_ char *v = NULL, **strv = NULL; @@ -92,7 +92,7 @@ int fstab_filter_options(const char *opts, const char *names, /* If !value and !filtered, this function is not allowed to fail. */ - if (!filtered) { + if (!ret_filtered) { const char *word, *state; size_t l; @@ -108,7 +108,7 @@ int fstab_filter_options(const char *opts, const char *names, x = word + strlen(name); if (IN_SET(*x, '\0', '=', ',')) { n = name; - if (value) { + if (ret_value) { free(v); if (IN_SET(*x, '\0', ',')) v = NULL; @@ -145,7 +145,7 @@ int fstab_filter_options(const char *opts, const char *names, found: /* Keep the last occurrence found */ n = name; - if (value) { + if (ret_value) { free(v); if (*x == '\0') v = NULL; @@ -162,19 +162,19 @@ int fstab_filter_options(const char *opts, const char *names, } answer: - if (namefound) - *namefound = n; - if (filtered) { + if (ret_namefound) + *ret_namefound = n; + if (ret_filtered) { char *f; f = strv_join(strv, ","); if (!f) return -ENOMEM; - *filtered = f; + *ret_filtered = f; } - if (value) - *value = TAKE_PTR(v); + if (ret_value) + *ret_value = TAKE_PTR(v); return !!n; } |