diff options
| author |  Nikias Bassen | 2020-01-14 02:54:01 +0100 |
|---|---|---|
| committer | Nikias Bassen | 2020-01-14 02:54:01 +0100 |
| commit | 1c2f7ad5e409a5ad38bf01a10501344f58a2d87b (patch) | |
| tree | 2f5a10c4cd9596cfea48a1a0da5f7d726571876f /src/libirecovery.c | |
| parent | db36196d8d9db5a1f92e6934cf931cd00a6ead2d (diff) | |
| download | libirecovery-1c2f7ad5e409a5ad38bf01a10501344f58a2d87b.tar.gz libirecovery-1c2f7ad5e409a5ad38bf01a10501344f58a2d87b.tar.bz2 | |
Use PRI* and SCN* (inttypes.h) format string macros instead of self-defined ones
... also print all values in irecovery as hex with 0x prefix to make it clear they are hex
Diffstat (limited to 'src/libirecovery.c')
| -rw-r--r-- | src/libirecovery.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/libirecovery.c b/src/libirecovery.c index 56294a6..f932684 100644 --- a/src/libirecovery.c +++ b/src/libirecovery.c @@ -2,7 +2,7 @@ * libirecovery.c * Communication to iBoot/iBSS on Apple iOS devices via USB * - * Copyright (c) 2011-2019 Nikias Bassen <nikias@gmx.li> + * Copyright (c) 2011-2020 Nikias Bassen <nikias@gmx.li> * Copyright (c) 2012-2015 Martin Szulecki <martin.szulecki@libimobiledevice.org> * Copyright (c) 2010 Chronic-Dev Team * Copyright (c) 2010 Joshua Hill @@ -27,6 +27,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <inttypes.h> #include <ctype.h> #include <unistd.h> #include <sys/stat.h> @@ -45,14 +46,10 @@ #include <IOKit/IOCFPlugIn.h> #include <pthread.h> #endif -#define _FMT_qX "%qX" -#define _FMT_016llx "%016llx" #else #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <setupapi.h> -#define _FMT_qX "%I64X" -#define _FMT_016llx "%016I64x" #ifndef sleep #define sleep(n) Sleep(1000 * n) #endif @@ -509,7 +506,7 @@ static void irecv_load_device_info_from_iboot_string(irecv_client_t client, cons ptr = strstr(iboot_string, "ECID:"); if (ptr != NULL) { - sscanf(ptr, "ECID:" _FMT_qX, &client->device_info.ecid); + sscanf(ptr, "ECID:%" SCNx64, &client->device_info.ecid); } ptr = strstr(iboot_string, "IBFL:"); @@ -739,7 +736,7 @@ irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ec mobiledevice_closepipes(_client); continue; } - debug("found device with ECID " _FMT_016llx "\n", (unsigned long long)ecid); + debug("found device with ECID %016" PRIx64 "\n", (unsigned long long)ecid); } found = 1; break; @@ -821,7 +818,7 @@ irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ec mobiledevice_closepipes(_client); continue; } - debug("found device with ECID " _FMT_016llx" \n", (unsigned long long)ecid); + debug("found device with ECID %016" PRIx64 "\n", (unsigned long long)ecid); } found = 1; break; @@ -1368,7 +1365,7 @@ IRECV_API irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, unsigned l irecv_close(client); continue; } - debug("found device with ECID " _FMT_016llx "\n", (unsigned long long)ecid); + debug("found device with ECID %016" PRIx64 "\n", (unsigned long long)ecid); } error = irecv_usb_set_configuration(client, 1); |