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.
This commit is contained in:
Yu Watanabe
2019-07-22 14:10:31 +09:00
parent 2e4effd129
commit 337874a45f
+3 -3
View File
@@ -314,7 +314,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)
@@ -333,7 +333,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;
}
@@ -349,7 +349,7 @@ static int list_files(PStoreList *list, const char *sourcepath) {
};
}
return r;
return 0;
}
static int run(int argc, char *argv[]) {