diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-02-20 17:59:37 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-02-20 19:18:52 +0100 |
| commit | 787a18c467c41d1e5bd8ec05af4afc29df63ea3d (patch) | |
| tree | 4c94970e5902190d11d3cceda53ca6693b226a92 /shared/systemd/src/basic/fileio.c | |
| parent | 209ff015e26f295bdb7c396962a4e9b4199398fb (diff) | |
| parent | 62e6df1f1cd2b3588086dabd38172a30d1253901 (diff) | |
| download | NetworkManager-787a18c467c41d1e5bd8ec05af4afc29df63ea3d.tar.gz | |
systemd: merge branch systemd into masterbg/systemd
Diffstat (limited to 'shared/systemd/src/basic/fileio.c')
| -rw-r--r-- | shared/systemd/src/basic/fileio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/shared/systemd/src/basic/fileio.c b/shared/systemd/src/basic/fileio.c index b172507b79..ee66190f72 100644 --- a/shared/systemd/src/basic/fileio.c +++ b/shared/systemd/src/basic/fileio.c @@ -215,7 +215,6 @@ int write_string_filef( int read_one_line_file(const char *fn, char **line) { _cleanup_fclose_ FILE *f = NULL; - int r; assert(fn); assert(line); @@ -226,8 +225,7 @@ int read_one_line_file(const char *fn, char **line) { (void) __fsetlocking(f, FSETLOCKING_BYCALLER); - r = read_line(f, LONG_LINE_MAX, line); - return r < 0 ? r : 0; + return read_line(f, LONG_LINE_MAX, line); } int verify_file(const char *fn, const char *blob, bool accept_extra_nl) { |