summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-14 21:35:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 21:35:41 +0000
commit679baa06b79e0c9100ce05fa0191928fc2a691fb (patch)
treed09a8d683cf713935e395168e403d1fbd61ea971 /updater
parent679be487206a9f987b553fad081efb455bd28fcf (diff)
parent4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49 (diff)
downloadbootable_recovery-679baa06b79e0c9100ce05fa0191928fc2a691fb.zip
bootable_recovery-679baa06b79e0c9100ce05fa0191928fc2a691fb.tar.gz
bootable_recovery-679baa06b79e0c9100ce05fa0191928fc2a691fb.tar.bz2
am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"
* commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49': Recovery 64-bit compile issues
Diffstat (limited to 'updater')
-rw-r--r--updater/install.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/updater/install.c b/updater/install.c
index faa1bb2..53f5e48 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -955,7 +955,7 @@ Value* FileGetPropFn(const char* name, State* state, int argc, Expr* argv[]) {
buffer = malloc(st.st_size+1);
if (buffer == NULL) {
- ErrorAbort(state, "%s: failed to alloc %lld bytes", name, st.st_size+1);
+ ErrorAbort(state, "%s: failed to alloc %lld bytes", name, (long long)st.st_size+1);
goto done;
}
@@ -968,7 +968,7 @@ Value* FileGetPropFn(const char* name, State* state, int argc, Expr* argv[]) {
if (fread(buffer, 1, st.st_size, f) != st.st_size) {
ErrorAbort(state, "%s: failed to read %lld bytes from %s",
- name, st.st_size+1, filename);
+ name, (long long)st.st_size+1, filename);
fclose(f);
goto done;
}