From 9ab98650ab0ce0ca816ba66814e7946c639d6b02 Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Sun, 5 Oct 2014 16:57:42 +0200
Subject: idevicebackup: Fix error variables for type consistency
---
tools/idevicebackup.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c
index c126869..2159566 100644
--- a/tools/idevicebackup.c
+++ b/tools/idevicebackup.c
@@ -735,6 +735,7 @@ static void print_usage(int argc, char **argv)
int main(int argc, char *argv[])
{
idevice_error_t ret = IDEVICE_E_UNKNOWN_ERROR;
+ lockdownd_error_t ldret = LOCKDOWN_E_UNKNOWN_ERROR;
int i;
char* udid = NULL;
lockdownd_service_descriptor_t service = NULL;
@@ -849,8 +850,8 @@ int main(int argc, char *argv[])
/* start notification_proxy */
np_client_t np = NULL;
- ret = lockdownd_start_service(client, NP_SERVICE_NAME, &service);
- if ((ret == LOCKDOWN_E_SUCCESS) && service && service->port) {
+ ldret = lockdownd_start_service(client, NP_SERVICE_NAME, &service);
+ if ((ldret == LOCKDOWN_E_SUCCESS) && service && service->port) {
np_client_new(device, service, &np);
np_set_notify_callback(np, notify_cb, NULL);
const char *noties[5] = {
@@ -870,8 +871,8 @@ int main(int argc, char *argv[])
/* start AFC, we need this for the lock file */
service->port = 0;
service->ssl_enabled = 0;
- ret = lockdownd_start_service(client, "com.apple.afc", &service);
- if ((ret == LOCKDOWN_E_SUCCESS) && service->port) {
+ ldret = lockdownd_start_service(client, "com.apple.afc", &service);
+ if ((ldret == LOCKDOWN_E_SUCCESS) && service->port) {
afc_client_new(device, service, &afc);
}
}
@@ -882,8 +883,8 @@ int main(int argc, char *argv[])
}
/* start mobilebackup service and retrieve port */
- ret = lockdownd_start_service(client, MOBILEBACKUP_SERVICE_NAME, &service);
- if ((ret == LOCKDOWN_E_SUCCESS) && service && service->port) {
+ ldret = lockdownd_start_service(client, MOBILEBACKUP_SERVICE_NAME, &service);
+ if ((ldret == LOCKDOWN_E_SUCCESS) && service && service->port) {
printf("Started \"%s\" service on port %d.\n", MOBILEBACKUP_SERVICE_NAME, service->port);
mobilebackup_client_new(device, service, &mobilebackup);
--
cgit v1.1-32-gdbae