colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd: merge branch systemd into master

Browse Source
This commit is contained in:
Beniamino Galvani
2019-02-20 17:59:37 +01:00
parent 209ff015e2 62e6df1f1c
commit 787a18c467
13 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/systemd/src/basic/fileio.c
View File

@@ -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) {