dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 06:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fileio: make return parameters of read_virtual_file() optional

Browse Source 
Prompted by: #19647
This commit is contained in:
Lennart Poettering
2021-05-20 21:26:56 +02:00
committed by Dan Streetman
parent f9e60ff9ad
commit f267c3142a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/fileio.c
View File

@@ -371,8 +371,6 @@ int read_virtual_file(const char *filename, size_t max_size, char **ret_contents
int n_retries;
bool truncated = false;
assert(ret_contents);
/* Virtual filesystems such as sysfs or procfs use kernfs, and kernfs can work with two sorts of
* virtual files. One sort uses "seq_file", and the results of the first read are buffered for the
* second read. The other sort uses "raw" reads which always go direct to the device. In the latter
@@ -486,7 +484,9 @@ int read_virtual_file(const char *filename, size_t max_size, char **ret_contents
return -EBADMSG;
buf[n] = 0;
*ret_contents = TAKE_PTR(buf);
if (ret_contents)
*ret_contents = TAKE_PTR(buf);
return !truncated;
}