From 656b96ca6caac90eb78266bd1fabe7b76bcb8c03 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Sat, 28 Sep 2019 12:49:17 +0200 Subject: cython: Fix all error codes after recent updates --- cython/mobilebackup.pxi | 8 ++++++-- cython/mobilebackup2.pxi | 10 +++++++--- cython/mobilesync.pxi | 14 +++++++++----- cython/restore.pxi | 16 ++++++---------- cython/screenshotr.pxi | 6 +++++- 5 files changed, 33 insertions(+), 21 deletions(-) (limited to 'cython') diff --git a/cython/mobilebackup.pxi b/cython/mobilebackup.pxi index 5a6fea6..f2d58d4 100644 --- a/cython/mobilebackup.pxi +++ b/cython/mobilebackup.pxi @@ -8,8 +8,10 @@ cdef extern from "libimobiledevice/mobilebackup.h": MOBILEBACKUP_E_INVALID_ARG = -1 MOBILEBACKUP_E_PLIST_ERROR = -2 MOBILEBACKUP_E_MUX_ERROR = -3 - MOBILEBACKUP_E_BAD_VERSION = -4 - MOBILEBACKUP_E_REPLY_NOT_OK = -5 + MOBILEBACKUP_E_SSL_ERROR = -4 + MOBILEBACKUP_E_RECEIVE_TIMEOUT = -5 + MOBILEBACKUP_E_BAD_VERSION = -6 + MOBILEBACKUP_E_REPLY_NOT_OK = -7 MOBILEBACKUP_E_UNKNOWN_ERROR = -256 ctypedef enum mobilebackup_flags_t: @@ -36,6 +38,8 @@ cdef class MobileBackupError(BaseError): MOBILEBACKUP_E_INVALID_ARG: "Invalid argument", MOBILEBACKUP_E_PLIST_ERROR: "Property list error", MOBILEBACKUP_E_MUX_ERROR: "MUX error", + MOBILEBACKUP_E_SSL_ERROR: "SSL error", + MOBILEBACKUP_E_RECEIVE_TIMEOUT: "Receive timeout", MOBILEBACKUP_E_BAD_VERSION: "Bad version", MOBILEBACKUP_E_REPLY_NOT_OK: "Reply not OK", MOBILEBACKUP_E_UNKNOWN_ERROR: "Unknown error" diff --git a/cython/mobilebackup2.pxi b/cython/mobilebackup2.pxi index aac5358..4eccae6 100644 --- a/cython/mobilebackup2.pxi +++ b/cython/mobilebackup2.pxi @@ -8,9 +8,11 @@ cdef extern from "libimobiledevice/mobilebackup2.h": MOBILEBACKUP2_E_INVALID_ARG = -1 MOBILEBACKUP2_E_PLIST_ERROR = -2 MOBILEBACKUP2_E_MUX_ERROR = -3 - MOBILEBACKUP2_E_BAD_VERSION = -4 - MOBILEBACKUP2_E_REPLY_NOT_OK = -5 - MOBILEBACKUP2_E_NO_COMMON_VERSION = -6 + MOBILEBACKUP2_E_SSL_ERROR = -4 + MOBILEBACKUP2_E_RECEIVE_TIMEOUT = -5 + MOBILEBACKUP2_E_BAD_VERSION = -6 + MOBILEBACKUP2_E_REPLY_NOT_OK = -7 + MOBILEBACKUP2_E_NO_COMMON_VERSION = -8 MOBILEBACKUP2_E_UNKNOWN_ERROR = -256 mobilebackup2_error_t mobilebackup2_client_new(idevice_t device, lockdownd_service_descriptor_t descriptor, mobilebackup2_client_t * client) @@ -31,6 +33,8 @@ cdef class MobileBackup2Error(BaseError): MOBILEBACKUP2_E_INVALID_ARG: "Invalid argument", MOBILEBACKUP2_E_PLIST_ERROR: "Property list error", MOBILEBACKUP2_E_MUX_ERROR: "MUX error", + MOBILEBACKUP2_E_SSL_ERROR: "SSL error", + MOBILEBACKUP2_E_RECEIVE_TIMEOUT: "Receive timeout", MOBILEBACKUP2_E_BAD_VERSION: "Bad version", MOBILEBACKUP2_E_REPLY_NOT_OK: "Reply not OK", MOBILEBACKUP2_E_NO_COMMON_VERSION: "No common version", diff --git a/cython/mobilesync.pxi b/cython/mobilesync.pxi index ba9d585..8dfe674 100644 --- a/cython/mobilesync.pxi +++ b/cython/mobilesync.pxi @@ -7,11 +7,13 @@ cdef extern from "libimobiledevice/mobilesync.h": MOBILESYNC_E_INVALID_ARG = -1 MOBILESYNC_E_PLIST_ERROR = -2 MOBILESYNC_E_MUX_ERROR = -3 - MOBILESYNC_E_BAD_VERSION = -4 - MOBILESYNC_E_SYNC_REFUSED = -5 - MOBILESYNC_E_CANCELLED = -6 - MOBILESYNC_E_WRONG_DIRECTION = -7 - MOBILESYNC_E_NOT_READY = -8 + MOBILESYNC_E_SSL_ERROR = -4 + MOBILESYNC_E_RECEIVE_TIMEOUT = -5 + MOBILESYNC_E_BAD_VERSION = -6 + MOBILESYNC_E_SYNC_REFUSED = -7 + MOBILESYNC_E_CANCELLED = -8 + MOBILESYNC_E_WRONG_DIRECTION = -9 + MOBILESYNC_E_NOT_READY = -10 MOBILESYNC_E_UNKNOWN_ERROR = -256 ctypedef enum mobilesync_sync_type_t: @@ -60,6 +62,8 @@ cdef class MobileSyncError(BaseError): MOBILESYNC_E_INVALID_ARG: "Invalid argument", MOBILESYNC_E_PLIST_ERROR: "Property list error", MOBILESYNC_E_MUX_ERROR: "MUX error", + MOBILESYNC_E_SSL_ERROR: "SSL eror", + MOBILESYNC_E_RECEIVE_TIMEOUT: "Receive timeout", MOBILESYNC_E_BAD_VERSION: "Bad version", MOBILESYNC_E_SYNC_REFUSED: "Sync refused", MOBILESYNC_E_CANCELLED: "Sync cancelled", diff --git a/cython/restore.pxi b/cython/restore.pxi index 7d3d80e..9d03935 100644 --- a/cython/restore.pxi +++ b/cython/restore.pxi @@ -6,12 +6,10 @@ cdef extern from "libimobiledevice/restore.h": ctypedef enum restored_error_t: RESTORE_E_SUCCESS = 0 RESTORE_E_INVALID_ARG = -1 - RESTORE_E_INVALID_CONF = -2 - RESTORE_E_PLIST_ERROR = -3 - RESTORE_E_DICT_ERROR = -4 - RESTORE_E_NOT_ENOUGH_DATA = -5 - RESTORE_E_MUX_ERROR = -6 - RESTORE_E_START_RESTORE_FAILED = -7 + RESTORE_E_PLIST_ERROR = -2 + RESTORE_E_MUX_ERROR = -3 + RESTORE_E_NOT_ENOUGH_DATA = -4 + RESTORE_E_RECEIVE_TIMEOUT = -5 RESTORE_E_UNKNOWN_ERROR = -256 restored_error_t restored_client_new(idevice_t device, restored_client_t *client, char *label) @@ -34,12 +32,10 @@ cdef class RestoreError(BaseError): self._lookup_table = { RESTORE_E_SUCCESS: "Success", RESTORE_E_INVALID_ARG: "Invalid argument", - RESTORE_E_INVALID_CONF: "Invalid configuration", RESTORE_E_PLIST_ERROR: "Property list error", - RESTORE_E_DICT_ERROR: "Dict error", - RESTORE_E_NOT_ENOUGH_DATA: "Not enough data", RESTORE_E_MUX_ERROR: "MUX Error", - RESTORE_E_START_RESTORE_FAILED: "Starting restore failed", + RESTORE_E_NOT_ENOUGH_DATA: "Not enough data", + RESTORE_E_RECEIVE_TIMEOUT: "Receive timeout", RESTORE_E_UNKNOWN_ERROR: "Unknown error" } BaseError.__init__(self, *args, **kwargs) diff --git a/cython/screenshotr.pxi b/cython/screenshotr.pxi index 2b2d53d..a1e82e2 100644 --- a/cython/screenshotr.pxi +++ b/cython/screenshotr.pxi @@ -8,7 +8,9 @@ cdef extern from "libimobiledevice/screenshotr.h": SCREENSHOTR_E_INVALID_ARG = -1 SCREENSHOTR_E_PLIST_ERROR = -2 SCREENSHOTR_E_MUX_ERROR = -3 - SCREENSHOTR_E_BAD_VERSION = -4 + SCREENSHOTR_E_SSL_ERROR = -4 + SCREENSHOTR_E_RECEIVE_TIMEOUT = 5 + SCREENSHOTR_E_BAD_VERSION = -6 SCREENSHOTR_E_UNKNOWN_ERROR = -256 screenshotr_error_t screenshotr_client_new(idevice_t device, lockdownd_service_descriptor_t descriptor, screenshotr_client_t * client) @@ -22,6 +24,8 @@ cdef class ScreenshotrError(BaseError): SCREENSHOTR_E_INVALID_ARG: "Invalid argument", SCREENSHOTR_E_PLIST_ERROR: "Property list error", SCREENSHOTR_E_MUX_ERROR: "MUX error", + SCREENSHOTR_E_SSL_ERROR: "SSL error", + SCREENSHOTR_E_RECEIVE_TIMEOUT: "Receive timeout", SCREENSHOTR_E_BAD_VERSION: "Bad version", SCREENSHOTR_E_UNKNOWN_ERROR: "Unknown error" } -- cgit v1.1-32-gdbae