resolve merge conflicts of 50f6417

Fix a typo for ota_fclose().

Change-Id: Ia93e911aa5391afc604874fc3a09c5a45c094c80
This commit is contained in:
Tianjie Xu 2016-05-23 14:58:53 -07:00
parent f5e2831bf3
commit 3f6eb86390

View file

@ -1013,7 +1013,6 @@ Value* FileGetPropFn(const char* name, State* state, int argc, Expr* argv[]) {
}
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);