From 4f75b6699c847b69dac0b0ab340b9782ea8064ef Mon Sep 17 00:00:00 2001 From: Donnie Pollitz Date: Mon, 22 Apr 2024 22:22:14 +0200 Subject: [PATCH] storageproxyd: Fix x86 builds Background: * printf format specifiers and size_t literal were invalid. Bug: 324989972 Test: Builds Change-Id: I408cfe0d41fb6850d5dcfe9963bb88be48f4a0c6 Signed-off-by: Donnie Pollitz --- trusty/storage/proxy/storage.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/trusty/storage/proxy/storage.c b/trusty/storage/proxy/storage.c index 1dab93d9c..6d0c61671 100644 --- a/trusty/storage/proxy/storage.c +++ b/trusty/storage/proxy/storage.c @@ -40,7 +40,7 @@ #define ALTERNATE_DATA_DIR "alternate/" /* Maximum file size for filesystem backed storage (i.e. not block dev backed storage) */ -static size_t max_file_size = 0x10000000000; +static uint64_t max_file_size = 0x10000000000; enum sync_state { SS_UNUSED = -1, @@ -778,7 +778,8 @@ err_response: int determine_max_file_size(const char* max_file_size_from) { /* Use default if none passed in */ if (max_file_size_from == NULL) { - ALOGI("No max file source given, continuing to use default: 0x%lx\n", max_file_size); + ALOGI("No max file source given, continuing to use default: 0x%" PRIx64 "\n", + max_file_size); return 0; } @@ -823,7 +824,7 @@ int determine_max_file_size(const char* max_file_size_from) { close(fd); max_file_size = max_size; - ALOGI("Using 0x%lx as max file size\n", max_file_size); + ALOGI("Using 0x%" PRIx64 " as max file size\n", max_file_size); return 0; }