diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-12-18 13:20:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 13:20:12 +0100 |
| commit | 8b35656c33cca5e8d0a71d651954f2ae9f0dce24 (patch) | |
| tree | b915261dea4a8e2891768a1e7a6aaf947739d1d6 /src/shared/bus-unit-util.c | |
| parent | 117d5a27a3480fd9729cfadd98d135d21732a88d (diff) | |
| parent | 5b5688afbe8125af23231ca221c822be0edc3f6e (diff) | |
Merge pull request #4911 from keszybz/fixlets
A few simple fixes / improvements
Diffstat (limited to 'src/shared/bus-unit-util.c')
| -rw-r--r-- | src/shared/bus-unit-util.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index b030b3b9d1..829be2c6da 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -579,15 +579,9 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen else if (streq(field, "MountFlags")) { unsigned long f; - if (isempty(eq)) - f = 0; - else { - f = mount_propagation_flags_from_string(eq); - if (f == 0) { - log_error("Failed to parse mount propagation type: %s", eq); - return -EINVAL; - } - } + r = mount_propagation_flags_from_string(eq, &f); + if (r < 0) + return log_error_errno(r, "Failed to parse mount propagation flags: %s", eq); r = sd_bus_message_append(m, "v", "t", f); } else if (STR_IN_SET(field, "BindPaths", "BindReadOnlyPaths")) { |