summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2020-07-06 16:08:27 +0200
committerGravatar Nikias Bassen2020-07-06 16:08:27 +0200
commit6e965298e439d52f8c96ccc98edb488891807c7d (patch)
tree13583c6d924097d1ee8e648a7d864ea822927a8c
parentce1d31fe7766f215fecdf4e2b3919efd1834c581 (diff)
downloadlibirecovery-6e965298e439d52f8c96ccc98edb488891807c7d.tar.gz
libirecovery-6e965298e439d52f8c96ccc98edb488891807c7d.tar.bz2
Fix compiler warning about format string specifiers by using uint64_t instead of unsinged long long
-rw-r--r--include/libirecovery.h6
-rw-r--r--src/libirecovery.c12
-rw-r--r--tools/irecovery.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/include/libirecovery.h b/include/libirecovery.h
index 9874e03..224a6a7 100644
--- a/include/libirecovery.h
+++ b/include/libirecovery.h
@@ -84,7 +84,7 @@ struct irecv_device_info {
unsigned int cpfm;
unsigned int scep;
unsigned int bdid;
- unsigned long long ecid;
+ uint64_t ecid;
unsigned int ibfl;
char* srnm;
char* imei;
@@ -117,8 +117,8 @@ void irecv_init(void); /* deprecated: libirecovery has constructor now */
void irecv_exit(void); /* deprecated: libirecovery has destructor now */
/* device connectivity */
-irecv_error_t irecv_open_with_ecid(irecv_client_t* client, unsigned long long ecid);
-irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts);
+irecv_error_t irecv_open_with_ecid(irecv_client_t* client, uint64_t ecid);
+irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, uint64_t ecid, int attempts);
irecv_error_t irecv_reset(irecv_client_t client);
irecv_error_t irecv_close(irecv_client_t client);
irecv_client_t irecv_reconnect(irecv_client_t client, int initial_pause);
diff --git a/src/libirecovery.c b/src/libirecovery.c
index d36234f..cf73465 100644
--- a/src/libirecovery.c
+++ b/src/libirecovery.c
@@ -662,9 +662,9 @@ typedef struct usb_control_request {
irecv_error_t mobiledevice_openpipes(irecv_client_t client);
void mobiledevice_closepipes(irecv_client_t client);
-irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ecid);
+irecv_error_t mobiledevice_connect(irecv_client_t* client, uint64_t ecid);
-irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ecid) {
+irecv_error_t mobiledevice_connect(irecv_client_t* client, uint64_t ecid) {
int found = 0;
SP_DEVICE_INTERFACE_DATA currentInterface;
HDEVINFO usbDevices;
@@ -1214,7 +1214,7 @@ static io_iterator_t iokit_usb_get_iterator_for_pid(UInt16 pid) {
return iterator;
}
-static irecv_error_t iokit_open_with_ecid(irecv_client_t* pclient, unsigned long long ecid) {
+static irecv_error_t iokit_open_with_ecid(irecv_client_t* pclient, uint64_t ecid) {
io_service_t service, ret_service;
io_iterator_t iterator;
@@ -1292,7 +1292,7 @@ static irecv_error_t iokit_open_with_ecid(irecv_client_t* pclient, unsigned long
#endif
#endif
-IRECV_API irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, unsigned long long ecid) {
+IRECV_API irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, uint64_t ecid) {
#ifdef USE_DUMMY
return IRECV_E_UNSUPPORTED;
#else
@@ -1629,7 +1629,7 @@ IRECV_API irecv_error_t irecv_reset(irecv_client_t client) {
#endif
}
-IRECV_API irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, unsigned long long ecid, int attempts) {
+IRECV_API irecv_error_t irecv_open_with_ecid_and_attempts(irecv_client_t* pclient, uint64_t ecid, int attempts) {
#ifdef USE_DUMMY
return IRECV_E_UNSUPPORTED;
#else
@@ -3185,7 +3185,7 @@ IRECV_API irecv_client_t irecv_reconnect(irecv_client_t client, int initial_paus
irecv_event_cb_t postcommand_callback = client->postcommand_callback;
irecv_event_cb_t disconnected_callback = client->disconnected_callback;
- unsigned long long ecid = client->device_info.ecid;
+ uint64_t ecid = client->device_info.ecid;
if (check_context(client) == IRECV_E_SUCCESS) {
irecv_close(client);
diff --git a/tools/irecovery.c b/tools/irecovery.c
index 6df328a..5cc454a 100644
--- a/tools/irecovery.c
+++ b/tools/irecovery.c
@@ -399,7 +399,7 @@ int main(int argc, char* argv[]) {
int i = 0;
int opt = 0;
int action = kNoAction;
- unsigned long long ecid = 0;
+ uint64_t ecid = 0;
int mode = -1;
char* argument = NULL;
irecv_error_t error = 0;