resolve merge conflicts of 50f6417
Fix a typo for ota_fclose().
Change-Id: Ia93e911aa5391afc604874fc3a09c5a45c094c80
diff --git a/updater/install.cpp b/updater/install.cpp
index dc27561..a65b32d 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -1013,7 +1013,6 @@
}
if (ota_fread(buffer, 1, st.st_size, f) != static_cast<size_t>(st.st_size)) {
- ota_fclose(f);
ErrorAbort(state, kFreadFailure, "%s: failed to read %zu bytes from %s",
name, static_cast<size_t>(st.st_size), filename);
ota_fclose(f);