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)
735int main(int argc, char *argv[]) 735int main(int argc, char *argv[])
736{ 736{
737 idevice_error_t ret = IDEVICE_E_UNKNOWN_ERROR; 737 idevice_error_t ret = IDEVICE_E_UNKNOWN_ERROR;
738 lockdownd_error_t ldret = LOCKDOWN_E_UNKNOWN_ERROR;
738 int i; 739 int i;
739 char* udid = NULL; 740 char* udid = NULL;
740 lockdownd_service_descriptor_t service = NULL; 741 lockdownd_service_descriptor_t service = NULL;
@@ -849,8 +850,8 @@ int main(int argc, char *argv[])
849 850
850 /* start notification_proxy */ 851 /* start notification_proxy */
851 np_client_t np = NULL; 852 np_client_t np = NULL;
852 ret = lockdownd_start_service(client, NP_SERVICE_NAME, &service); 853 ldret = lockdownd_start_service(client, NP_SERVICE_NAME, &service);
853 if ((ret == LOCKDOWN_E_SUCCESS) && service && service->port) { 854 if ((ldret == LOCKDOWN_E_SUCCESS) && service && service->port) {
854 np_client_new(device, service, &np); 855 np_client_new(device, service, &np);
855 np_set_notify_callback(np, notify_cb, NULL); 856 np_set_notify_callback(np, notify_cb, NULL);
856 const char *noties[5] = { 857 const char *noties[5] = {
@@ -870,8 +871,8 @@ int main(int argc, char *argv[])
870 /* start AFC, we need this for the lock file */ 871 /* start AFC, we need this for the lock file */
871 service->port = 0; 872 service->port = 0;
872 service->ssl_enabled = 0; 873 service->ssl_enabled = 0;
873 ret = lockdownd_start_service(client, "com.apple.afc", &service); 874 ldret = lockdownd_start_service(client, "com.apple.afc", &service);
874 if ((ret == LOCKDOWN_E_SUCCESS) && service->port) { 875 if ((ldret == LOCKDOWN_E_SUCCESS) && service->port) {
875 afc_client_new(device, service, &afc); 876 afc_client_new(device, service, &afc);
876 } 877 }
877 } 878 }
@@ -882,8 +883,8 @@ int main(int argc, char *argv[])
882 } 883 }
883 884
884 /* start mobilebackup service and retrieve port */ 885 /* start mobilebackup service and retrieve port */
885 ret = lockdownd_start_service(client, MOBILEBACKUP_SERVICE_NAME, &service); 886 ldret = lockdownd_start_service(client, MOBILEBACKUP_SERVICE_NAME, &service);
886 if ((ret == LOCKDOWN_E_SUCCESS) && service && service->port) { 887 if ((ldret == LOCKDOWN_E_SUCCESS) && service && service->port) {
887 printf("Started \"%s\" service on port %d.\n", MOBILEBACKUP_SERVICE_NAME, service->port); 888 printf("Started \"%s\" service on port %d.\n", MOBILEBACKUP_SERVICE_NAME, service->port);
888 mobilebackup_client_new(device, service, &mobilebackup); 889 mobilebackup_client_new(device, service, &mobilebackup);
889 890