summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-08-05 02:12:37 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-05 02:12:37 +0200
commitb04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3 (patch)
treeec6d4bad929d2e9615c1e676b32ae84b07576eeb
parentam eaf33654: only do uncryption on packages in /data (diff)
parentFix length printing + formats (diff)
downloadandroid_bootable_recovery-b04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3.tar
android_bootable_recovery-b04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3.tar.gz
android_bootable_recovery-b04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3.tar.bz2
android_bootable_recovery-b04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3.tar.lz
android_bootable_recovery-b04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3.tar.xz
android_bootable_recovery-b04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3.tar.zst
android_bootable_recovery-b04d0b0dde1a3a0ad9f7dd7e829d49f1d83a9cb3.zip
-rw-r--r--roots.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/roots.cpp b/roots.cpp
index 8f9901908..ee140160c 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -235,15 +235,15 @@ int format_volume(const char* volume) {
result = make_ext4fs(v->blk_device, length, volume, sehandle);
} else { /* Has to be f2fs because we checked earlier. */
if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {
- LOGE("format_volume: crypt footer + negative length (%lld) not supported on %s\n", v->fs_type, length);
+ LOGE("format_volume: crypt footer + negative length (%zd) not supported on %s\n", length, v->fs_type);
return -1;
}
if (length < 0) {
- LOGE("format_volume: negative length (%ld) not supported on %s\n", length, v->fs_type);
+ LOGE("format_volume: negative length (%zd) not supported on %s\n", length, v->fs_type);
return -1;
}
char *num_sectors;
- if (asprintf(&num_sectors, "%ld", length / 512) <= 0) {
+ if (asprintf(&num_sectors, "%zd", length / 512) <= 0) {
LOGE("format_volume: failed to create %s command for %s\n", v->fs_type, v->blk_device);
return -1;
}