aboutsummaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-08-04 16:44:33 -0700
committerJP Abgrall <jpa@google.com>2014-08-04 16:44:33 -0700
commit78d458c3d279a24a60fda013026b7a5454d01a9b (patch)
treeec6d4bad929d2e9615c1e676b32ae84b07576eeb /roots.cpp
parenteaf33654c1817bd665831a13c5bd0c04daabee02 (diff)
downloadbootable_recovery-78d458c3d279a24a60fda013026b7a5454d01a9b.zip
bootable_recovery-78d458c3d279a24a60fda013026b7a5454d01a9b.tar.gz
bootable_recovery-78d458c3d279a24a60fda013026b7a5454d01a9b.tar.bz2
Fix length printing + formats
Fix wrong argument order. Fix for 32 vs 64 bit. (reported by htc) Change-Id: Ie37a280bed2848199bcc075500e1326e371cd326
Diffstat (limited to 'roots.cpp')
-rw-r--r--roots.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/roots.cpp b/roots.cpp
index 8f99019..ee14016 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;
}