ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libsparse: Don't spam errors in sparse_file_import_auto." am: bed6eea329

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2113794

Change-Id: I80ad198d682f7884aaf8b1546e250707a734f4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2022-06-02 18:18:29 +00:00 • committed by Automerger Merge Worker
commit 5b8a2a6e55
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libsparse/sparse_read.cpp
View file

@ -670,7 +670,7 @@ struct sparse_file* sparse_file_import_auto(int fd, bool crc, bool verbose) {
int64_t len;
int ret;
s = sparse_file_import(fd, verbose, crc);
s = sparse_file_import(fd, false, crc);
if (s) {
return s;
}
@ -686,6 +686,9 @@ struct sparse_file* sparse_file_import_auto(int fd, bool crc, bool verbose) {
if (!s) {
return nullptr;
}
if (verbose) {
sparse_file_verbose(s);
}
ret = sparse_file_read_normal(s, fd);
if (ret < 0) {