From 5a4bc455c356214b60bdb67c88d752359311ab20 Mon Sep 17 00:00:00 2001 From: Nick Chan Date: Tue, 7 Nov 2023 17:05:22 +0800 Subject: [PATCH] fix some formatting on 32-bit PC --- include/palerain.h | 12 ++++++------ src/dfuhelper.c | 4 ++-- src/exec_checkra1n.c | 6 +++--- src/optparse.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/palerain.h b/include/palerain.h index ec1e5bb..781683f 100644 --- a/include/palerain.h +++ b/include/palerain.h @@ -32,7 +32,7 @@ #define USB_RET_NOT_RESPONDING LIBUSB_ERROR_OTHER #define USB_RET_IO LIBUSB_ERROR_IO #define USB_RET_NO_DEVICE LIBUSB_ERROR_NO_DEVICE -typedef int usb_ret_t; +typedef int32_t usb_ret_t; typedef libusb_device_handle *usb_device_handle_t; typedef struct stuff @@ -80,8 +80,8 @@ usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, uint32_t len); #define MH_CIGAM_64 0xcffaedfe #define MH_KEXT_BUNDLE 0xb -typedef int cpu_type_t; -typedef int cpu_subtype_t; +typedef int32_t cpu_type_t; +typedef int32_t cpu_subtype_t; #define CPU_ARCH_ABI64 0x01000000 #define CPU_TYPE_ARM ((cpu_type_t) 12) @@ -131,7 +131,7 @@ typedef struct { typedef struct { int mode; - unsigned int cpid; + int cpid; char product_type[0x20]; char display_name[0x20]; char iboot_ver[0x20]; @@ -140,9 +140,9 @@ typedef struct { typedef struct { uint32_t magic; /* 0xd803b376*/ unsigned char* ptr; /* pointer to the override file in memory */ - unsigned int len; /* length of override file */ + uint32_t len; /* length of override file */ unsigned char* orig_ptr; /* pointer to the overriden file */ - unsigned int orig_len; /* length of the overriden file */ + uint32_t orig_len; /* length of the overriden file */ int fd; /* file descriptor of the override file */ } override_file_t; diff --git a/src/dfuhelper.c b/src/dfuhelper.c index 268c278..1ecb234 100644 --- a/src/dfuhelper.c +++ b/src/dfuhelper.c @@ -218,7 +218,7 @@ void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) { event->mode == IRECV_K_RECOVERY_MODE_3 || event->mode == IRECV_K_RECOVERY_MODE_4) { if (!(palerain_flags & palerain_option_device_info)) - LOG(LOG_VERBOSE, "Recovery mode device %ld connected", event->device_info->ecid); + LOG(LOG_VERBOSE, "Recovery mode device %" PRIu64 " connected", event->device_info->ecid); if ((palerain_flags & palerain_option_exit_recovery)) { ret = exitrecv_cmd(event->device_info->ecid); if (!ret) { @@ -258,7 +258,7 @@ void irecv_device_event_cb(const irecv_device_event_t *event, void* userdata) { pthread_create(&recovery_thread, NULL, (pthread_start_t)connected_recovery_mode, event->device_info); } else if (event->mode == IRECV_K_DFU_MODE) { if (!(palerain_flags & palerain_option_device_info)) - LOG(LOG_VERBOSE, "DFU mode device %ld connected", event->device_info->ecid); + LOG(LOG_VERBOSE, "DFU mode device %" PRIu64 " connected", event->device_info->ecid); if ((palerain_flags & palerain_option_device_info)) { recvinfo_t info; diff --git a/src/exec_checkra1n.c b/src/exec_checkra1n.c index 9cc47fb..9bf6ec4 100644 --- a/src/exec_checkra1n.c +++ b/src/exec_checkra1n.c @@ -51,7 +51,7 @@ int exec_checkra1n(void) { } ssize_t didWrite_Pongo_bin = write(fd_pongo, Pongo_bin, Pongo_bin_len); if (didWrite_Pongo_bin != (ssize_t)Pongo_bin_len) { - LOG(LOG_FATAL, "Size written to %s does not match expected: %lld != %d: %d (%s)", pongo_path, didWrite_Pongo_bin, Pongo_bin_len, errno, strerror(errno)); + LOG(LOG_FATAL, "Size written to %s does not match expected: %zd != %u: %d (%s)", pongo_path, didWrite_Pongo_bin, Pongo_bin_len, errno, strerror(errno)); close(fd_pongo); unlink(pongo_path); free(pongo_path); @@ -71,7 +71,7 @@ int exec_checkra1n(void) { } ssize_t didWrite_checkra1n = write(fd_checkra1n, checkra1n, checkra1n_len); if (didWrite_checkra1n != (ssize_t)checkra1n_len) { - LOG(LOG_FATAL, "Size written to %s does not match expected: %lld != %d: %d (%s)", checkra1n_path, didWrite_checkra1n, checkra1n_len, errno, strerror(errno)); + LOG(LOG_FATAL, "Size written to %s does not match expected: %zd != %d: %d (%s)", checkra1n_path, didWrite_checkra1n, checkra1n_len, errno, strerror(errno)); close(fd_checkra1n); unlink(checkra1n_path); free(checkra1n_path); @@ -106,7 +106,7 @@ int exec_checkra1n(void) { } ssize_t didWrite_libcheckra1nhelper = write(helper_fd, libcheckra1nhelper_dylib, libcheckra1nhelper_dylib_len); if ((unsigned int)didWrite_libcheckra1nhelper != libcheckra1nhelper_dylib_len) { - LOG(LOG_FATAL, "Size written does not match expected: %lld != %d: %d (%s)", didWrite_libcheckra1nhelper, libcheckra1nhelper_dylib_len, errno, strerror(errno)); + LOG(LOG_FATAL, "Size written does not match expected: %zd != %d: %d (%s)", didWrite_libcheckra1nhelper, libcheckra1nhelper_dylib_len, errno, strerror(errno)); close(helper_fd); unlink(libcheckra1nhelper_dylib_path); return -1; diff --git a/src/optparse.c b/src/optparse.c index 4004913..272009b 100644 --- a/src/optparse.c +++ b/src/optparse.c @@ -327,15 +327,15 @@ int optparse(int argc, char* argv[]) { snprintf(palerain_flags_cmd, 0x30, "palera1n_flags 0x%" PRIx64, palerain_flags); LOG(LOG_VERBOSE3, "palerain_flags: %s", palerain_flags_cmd); if (override_kpf.magic == OVERRIDE_MAGIC) { - LOG(LOG_VERBOSE4, "kpf override length %u -> %u", override_kpf.orig_len, checkra1n_kpf_pongo_lzma_len); + LOG(LOG_VERBOSE4, "kpf override length %" PRIu32 " -> %" PRIu32, override_kpf.orig_len, checkra1n_kpf_pongo_lzma_len); LOG(LOG_VERBOSE4, "kpf override ptr %p -> %p", override_kpf.orig_ptr, **kpf_to_upload); } if (override_ramdisk.magic == OVERRIDE_MAGIC) { - LOG(LOG_VERBOSE4, "ramdisk override length %u -> %u", override_ramdisk.orig_len, ramdisk_dmg_lzma_len); + LOG(LOG_VERBOSE4, "ramdisk override length %" PRIu32 " -> %" PRIu32, override_ramdisk.orig_len, ramdisk_dmg_lzma_len); LOG(LOG_VERBOSE4, "ramdisk override ptr %p -> %p", override_ramdisk.orig_ptr, **ramdisk_to_upload); } if (override_overlay.magic == OVERRIDE_MAGIC) { - LOG(LOG_VERBOSE4, "overlay override length %u -> %u", override_overlay.orig_len, binpack_dmg_len); + LOG(LOG_VERBOSE4, "overlay override length %" PRIu32 " -> %" PRIu32, override_overlay.orig_len, binpack_dmg_len); LOG(LOG_VERBOSE4, "overlay override ptr %p -> %p", override_overlay.orig_ptr, **overlay_to_upload); }