summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2014-10-05 16:57:42 +0200
committerGravatar Martin Szulecki2014-10-05 16:57:42 +0200
commit9ab98650ab0ce0ca816ba66814e7946c639d6b02 (patch)
tree98666960be320aa28177c959c326ab9b1c23ba0b
parent5072dea1373b7c4789a9ea1e65d05ea30acf41ed (diff)
downloadlibimobiledevice-9ab98650ab0ce0ca816ba66814e7946c639d6b02.tar.gz
libimobiledevice-9ab98650ab0ce0ca816ba66814e7946c639d6b02.tar.bz2
idevicebackup: Fix error variables for type consistency
-rw-r--r--tools/idevicebackup.c13
1 files 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);