No description
b8df5fb90e
We have the following warnings when compiling uncrypt on LP64 (e.g.
aosp_angler-userdebug).
bootable/recovery/uncrypt/uncrypt.cpp:77:53: warning: format specifies type 'long long' but the argument has type 'off64_t' (aka 'long') [-Wformat]
ALOGE("error seeking to offset %lld: %s\n", offset, strerror(errno));
~~~~ ^~~~~~
%ld
bootable/recovery/uncrypt/uncrypt.cpp:84:54: warning: format specifies type 'long long' but the argument has type 'unsigned long' [-Wformat]
ALOGE("error writing offset %lld: %s\n", (offset + written), strerror(errno));
~~~~ ^~~~~~~~~~~~~~~~~~
%lu
bootable/recovery/uncrypt/uncrypt.cpp:246:16: warning: comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'off_t' (aka 'long') [-Wsign-compare]
while (pos < sb.st_size) {
~~~ ^ ~~~~~~~~~~
According to POSIX spec [1], we have:
off_t and blksize_t shall be signed integer types;
size_t shall be an unsigned integer type;
blksize_t and size_t are no greater than the width of type long.
And on Android, we always have a 64-bit st_size from stat(2)
(//bionic/libc/include/sys/stat.h).
Fix the type and add necessary casts to suppress the warnings.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
Change-Id: I5d64d5b7919c541441176c364752de047f9ecb20
|
||
|---|---|---|
| applypatch | ||
| edify | ||
| etc | ||
| fonts | ||
| minadbd | ||
| minui | ||
| minzip | ||
| mtdutils | ||
| res-hdpi/images | ||
| res-mdpi/images | ||
| res-xhdpi/images | ||
| res-xxhdpi/images | ||
| res-xxxhdpi/images | ||
| testdata | ||
| tests | ||
| tools | ||
| uncrypt | ||
| update_verifier | ||
| updater | ||
| adb_install.cpp | ||
| adb_install.h | ||
| Android.mk | ||
| asn1_decoder.cpp | ||
| asn1_decoder.h | ||
| bootloader.cpp | ||
| bootloader.h | ||
| CleanSpec.mk | ||
| common.h | ||
| default_device.cpp | ||
| device.cpp | ||
| device.h | ||
| fuse_sdcard_provider.cpp | ||
| fuse_sdcard_provider.h | ||
| fuse_sideload.cpp | ||
| fuse_sideload.h | ||
| install.cpp | ||
| install.h | ||
| interlace-frames.py | ||
| NOTICE | ||
| print_sha1.h | ||
| README.md | ||
| recovery.cpp | ||
| res-560dpi | ||
| roots.cpp | ||
| roots.h | ||
| screen_ui.cpp | ||
| screen_ui.h | ||
| ui.cpp | ||
| ui.h | ||
| unique_fd.h | ||
| verifier.cpp | ||
| verifier.h | ||
| verifier_test.cpp | ||
| verifier_test.sh | ||
| wear_ui.cpp | ||
| wear_ui.h | ||
The Recovery Image
Quick turn-around testing
mm -j && m ramdisk-nodeps && m recoveryimage-nodeps
# To boot into the new recovery image
# without flashing the recovery partition:
adb reboot bootloader
fastboot boot $ANDROID_PRODUCT_OUT/recovery.img