From a0485b96118d3d2ac439f510e404ffb3db03e23f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 22 Jul 2019 10:55:10 +0900 Subject: [PATCH] pstopre: fix return value of list_files() Previously, the return value of the last read_full_file() is returned. This makes the error in read_full_file() is always ignored. (cherry picked from commit 337874a45fff46a80e4974c681a5e651f3a0fac9) Related: #2158832 --- src/pstore/pstore.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c index e6a342fc50..2fbef48543 100644 --- a/src/pstore/pstore.c +++ b/src/pstore/pstore.c @@ -311,7 +311,7 @@ static void process_dmesg_files(PStoreList *list) { static int list_files(PStoreList *list, const char *sourcepath) { _cleanup_(closedirp) DIR *dirp = NULL; struct dirent *de; - int r = 0; + int r; dirp = opendir(sourcepath); if (!dirp) @@ -330,7 +330,7 @@ static int list_files(PStoreList *list, const char *sourcepath) { /* Now read contents of pstore file */ r = read_full_file(ifd_path, &buf, &buf_size); if (r < 0) { - log_warning_errno(r, "Failed to read file %s: %m", ifd_path); + log_warning_errno(r, "Failed to read file %s, skipping: %m", ifd_path); continue; } @@ -346,7 +346,7 @@ static int list_files(PStoreList *list, const char *sourcepath) { }; } - return r; + return 0; } static int run(int argc, char *argv[]) {