diff options
| author |  Martin Szulecki | 2013-11-10 22:53:51 +0100 |
|---|---|---|
| committer | Martin Szulecki | 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) return INSTPROXY_E_PLIST_ERROR; case PROPERTY_LIST_SERVICE_E_MUX_ERROR: return INSTPROXY_E_CONN_FAILED; + case PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT: + return INSTPROXY_E_RECEIVE_TIMEOUT; default: break; } 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) np_lock(client); property_list_service_error_t perr = property_list_service_receive_plist_with_timeout(client->parent, &dict, 500); - if (perr == PROPERTY_LIST_SERVICE_E_TIMEOUT) { + if (perr == PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT) { debug_info("NotificationProxy: no notification received!"); res = 0; } 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 *plist = NULL; service_error_t serr = service_receive_with_timeout(client->parent, (char*)&pktlen, sizeof(pktlen), &bytes, timeout); if ((serr == SERVICE_E_SUCCESS) && (bytes == 0)) { - return PROPERTY_LIST_SERVICE_E_TIMEOUT; + return PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT; } debug_info("initial read=%i", bytes); 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 @@ #define PROPERTY_LIST_SERVICE_E_PLIST_ERROR -2 #define PROPERTY_LIST_SERVICE_E_MUX_ERROR -3 #define PROPERTY_LIST_SERVICE_E_SSL_ERROR -4 -#define PROPERTY_LIST_SERVICE_E_TIMEOUT -5 +#define PROPERTY_LIST_SERVICE_E_RECEIVE_TIMEOUT -5 #define PROPERTY_LIST_SERVICE_E_UNKNOWN_ERROR -256 |