basic: change read_one_line_file() to return number of bytes read
Change detect_vm_xen_dom0() to match new usage.
This commit is contained in:
parent
118dccc948
commit
d6062e3b4f
|
@ -212,7 +212,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);
|
||||
|
@ -223,8 +222,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) {
|
||||
|
|
|
@ -202,7 +202,7 @@ static int detect_vm_xen_dom0(void) {
|
|||
r = read_one_line_file(PATH_FEATURES, &domcap);
|
||||
if (r < 0 && r != -ENOENT)
|
||||
return r;
|
||||
if (r == 0) {
|
||||
if (r >= 0) {
|
||||
unsigned long features;
|
||||
|
||||
/* Here, we need to use sscanf() instead of safe_atoul()
|
||||
|
|
Loading…
Reference in a new issue