chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8526644
)
fileio: return 0 from read_one_line_file on success
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 24 Sep 2017 12:27:21 +0000
(14:27 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Sun, 24 Sep 2017 12:27:21 +0000
(14:27 +0200)
Fixup for
f4b51a2d09
. Suggested by Evgeny Vereshchagin.
src/basic/fileio.c
patch
|
blob
|
history
diff --git
a/src/basic/fileio.c
b/src/basic/fileio.c
index 13c9a224a1c39b6734c0caa1a418b31a8638ace2..60b34f1257390cac7f488ff6055876f328fecb3d 100644
(file)
--- a/
src/basic/fileio.c
+++ b/
src/basic/fileio.c
@@
-176,6
+176,7
@@
fail:
int read_one_line_file(const char *fn, char **line) {
_cleanup_fclose_ FILE *f = NULL;
+ int r;
assert(fn);
assert(line);
@@
-184,7
+185,8
@@
int read_one_line_file(const char *fn, char **line) {
if (!f)
return -errno;
- return read_line(f, LONG_LINE_MAX, line);
+ r = read_line(f, LONG_LINE_MAX, line);
+ return r < 0 ? r : 0;
}
int verify_file(const char *fn, const char *blob, bool accept_extra_nl) {