summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Runge <mrunge@google.com>2013-12-14 02:13:11 +0100
committerMichael Runge <mrunge@google.com>2013-12-14 02:13:11 +0100
commit6eed2247714967eb0ce913d7da782fa884a4c1bd (patch)
tree55fe29aa07ceee2f82f3cdacb25f4fedcb85f963
parentadd the functions for multi-stage packages to updater (diff)
downloadandroid_bootable_recovery-6eed2247714967eb0ce913d7da782fa884a4c1bd.tar
android_bootable_recovery-6eed2247714967eb0ce913d7da782fa884a4c1bd.tar.gz
android_bootable_recovery-6eed2247714967eb0ce913d7da782fa884a4c1bd.tar.bz2
android_bootable_recovery-6eed2247714967eb0ce913d7da782fa884a4c1bd.tar.lz
android_bootable_recovery-6eed2247714967eb0ce913d7da782fa884a4c1bd.tar.xz
android_bootable_recovery-6eed2247714967eb0ce913d7da782fa884a4c1bd.tar.zst
android_bootable_recovery-6eed2247714967eb0ce913d7da782fa884a4c1bd.zip
-rw-r--r--updater/install.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/updater/install.c b/updater/install.c
index 9f299f6cc..b6852b0c7 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -1353,7 +1353,6 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) {
}
if (args[0]->size < 0) {
- printf("%s(): no file contents received", name);
return StringValue(strdup(""));
}
uint8_t digest[SHA_DIGEST_SIZE];
@@ -1406,12 +1405,11 @@ Value* ReadFileFn(const char* name, State* state, int argc, Expr* argv[]) {
FileContents fc;
if (LoadFileContents(filename, &fc, RETOUCH_DONT_MASK) != 0) {
- ErrorAbort(state, "%s() loading \"%s\" failed: %s",
- name, filename, strerror(errno));
free(filename);
- free(v);
+ v->size = -1;
+ v->data = NULL;
free(fc.data);
- return NULL;
+ return v;
}
v->size = fc.size;