diff options
| author | 2013-11-10 22:53:51 +0100 | |
|---|---|---|
| committer | 2013-11-10 22:53:51 +0100 | |
| commit | a12a053190c252498f171999cf5927d782fdbcb7 (patch) | |
| tree | 8b02b5df584f97f6d8c69a73932ab88ba7f9461d | |
| parent | 24a37ba75cc95fdd4382ada67197163a84b9cb8f (diff) | |
| download | libimobiledevice-a12a053190c252498f171999cf5927d782fdbcb7.tar.gz libimobiledevice-a12a053190c252498f171999cf5927d782fdbcb7.tar.bz2 | |
property_list_service: Rename RECEIVE_TIMEOUT error for more clarity
| -rw-r--r-- | src/installation_proxy.c | 2 | ||||
| -rw-r--r-- | src/notification_proxy.c | 2 | ||||
| -rw-r--r-- | src/property_list_service.c | 2 | ||||
| -rw-r--r-- | src/property_list_service.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/installation_proxy.c b/src/installation_proxy.c index 9aa896b..7ee12cc 100644 --- a/src/installation_proxy.c +++ b/src/installation_proxy.c | |||
| @@ -77,6 +77,8 @@ static instproxy_error_t instproxy_error(property_list_service_error_t err) | |||
| 77 | return INSTPROXY_E_PLIST_ERROR; | 77 | return INSTPROXY_E_PLIST_ERROR; |
| 78 | case PROPERTY_LIST_SERVICE_E_MUX_ERROR: | 78 | case PROPERTY_LIST_SERVICE_E_MUX_ERROR: |
| 79 | return INSTPROXY_E_CONN_FAILED; | 79 | return INSTPROXY_E_CONN_FAILED; |
| 80 | case PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT: | ||
| 81 | return INSTPROXY_E_RECEIVE_TIMEOUT; | ||
| 80 | default: | 82 | default: |
| 81 | break; | 83 | break; |
| 82 | } | 84 | } |
diff --git a/src/notification_proxy.c b/src/notification_proxy.c index d219b30..6073b76 100644 --- a/src/notification_proxy.c +++ b/src/notification_proxy.c | |||
| @@ -310,7 +310,7 @@ static int np_get_notification(np_client_t client, char **notification) | |||
| 310 | np_lock(client); | 310 | np_lock(client); |
| 311 | 311 | ||
| 312 | property_list_service_error_t perr = property_list_service_receive_plist_with_timeout(client->parent, &dict, 500); | 312 | property_list_service_error_t perr = property_list_service_receive_plist_with_timeout(client->parent, &dict, 500); |
| 313 | if (perr == PROPERTY_LIST_SERVICE_E_TIMEOUT) { | 313 | if (perr == PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT) { |
| 314 | debug_info("NotificationProxy: no notification received!"); | 314 | debug_info("NotificationProxy: no notification received!"); |
| 315 | res = 0; | 315 | res = 0; |
| 316 | } else if (perr != PROPERTY_LIST_SERVICE_E_SUCCESS) { | 316 | } else if (perr != PROPERTY_LIST_SERVICE_E_SUCCESS) { |
diff --git a/src/property_list_service.c b/src/property_list_service.c index 6efeaf1..b8d4b93 100644 --- a/src/property_list_service.c +++ b/src/property_list_service.c | |||
| @@ -226,7 +226,7 @@ static property_list_service_error_t internal_plist_receive_timeout(property_lis | |||
| 226 | *plist = NULL; | 226 | *plist = NULL; |
| 227 | service_error_t serr = service_receive_with_timeout(client->parent, (char*)&pktlen, sizeof(pktlen), &bytes, timeout); | 227 | service_error_t serr = service_receive_with_timeout(client->parent, (char*)&pktlen, sizeof(pktlen), &bytes, timeout); |
| 228 | if ((serr == SERVICE_E_SUCCESS) && (bytes == 0)) { | 228 | if ((serr == SERVICE_E_SUCCESS) && (bytes == 0)) { |
| 229 | return PROPERTY_LIST_SERVICE_E_TIMEOUT; | 229 | return PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT; |
| 230 | } | 230 | } |
| 231 | debug_info("initial read=%i", bytes); | 231 | debug_info("initial read=%i", bytes); |
| 232 | if (bytes < 4) { | 232 | if (bytes < 4) { |
diff --git a/src/property_list_service.h b/src/property_list_service.h index 84053e0..5c5f38f 100644 --- a/src/property_list_service.h +++ b/src/property_list_service.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define PROPERTY_LIST_SERVICE_E_PLIST_ERROR -2 | 32 | #define PROPERTY_LIST_SERVICE_E_PLIST_ERROR -2 |
| 33 | #define PROPERTY_LIST_SERVICE_E_MUX_ERROR -3 | 33 | #define PROPERTY_LIST_SERVICE_E_MUX_ERROR -3 |
| 34 | #define PROPERTY_LIST_SERVICE_E_SSL_ERROR -4 | 34 | #define PROPERTY_LIST_SERVICE_E_SSL_ERROR -4 |
| 35 | #define PROPERTY_LIST_SERVICE_E_TIMEOUT -5 | 35 | #define PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT -5 |
| 36 | 36 | ||
| 37 | #define PROPERTY_LIST_SERVICE_E_UNKNOWN_ERROR -256 | 37 | #define PROPERTY_LIST_SERVICE_E_UNKNOWN_ERROR -256 |
| 38 | 38 | ||
