diff options
| author | Vito Caputo <vcaputo@pengaru.com> | 2020-03-31 01:07:21 -0700 |
|---|---|---|
| committer | Vito Caputo <vcaputo@pengaru.com> | 2020-03-31 06:48:03 -0700 |
| commit | 4fa744a35cd5f6dd18cd38f79a1b6a1c9547fd16 (patch) | |
| tree | b4913f33bc795668ff3c383dc09f7a71453b9175 /src/machine/machine-dbus.c | |
| parent | 3ebbb6cb394f8a328a9bba782e3b1cbeac4d9a7b (diff) | |
| download | systemd-4fa744a35cd5f6dd18cd38f79a1b6a1c9547fd16.tar.gz | |
*: convert amenable fdopen calls to take_fdopen
Mechanical change to eliminate some cruft by using the
new take_fdopen{_unlocked}() wrappers where trivial.
Diffstat (limited to 'src/machine/machine-dbus.c')
| -rw-r--r-- | src/machine/machine-dbus.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index a2990452af..5c0f714184 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -20,6 +20,7 @@ #include "env-file.h" #include "env-util.h" #include "fd-util.h" +#include "fileio.h" #include "format-util.h" #include "fs-util.h" #include "in-addr-util.h" @@ -399,12 +400,10 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s pair[1] = safe_close(pair[1]); - f = fdopen(pair[0], "r"); + f = take_fdopen(&pair[0], "r"); if (!f) return -errno; - pair[0] = -1; - r = load_env_file_pairs(f, "/etc/os-release", &l); if (r < 0) return r; |