diff options
37 files changed, 57 insertions, 58 deletions
diff --git a/include/libimobiledevice/afc.h b/include/libimobiledevice/afc.h index 5b61499..790df3d 100644 --- a/include/libimobiledevice/afc.h +++ b/include/libimobiledevice/afc.h @@ -83,8 +83,8 @@ typedef enum { AFC_LOCK_UN = 8 | 4 // unlock } afc_lock_op_t; -struct afc_client_int; -typedef struct afc_client_int *afc_client_t; +typedef struct afc_client_private afc_client_private; +typedef afc_client_private *afc_client_t; /**< The client handle. */ /* Interface */ afc_error_t afc_client_new(idevice_t device, uint16_t port, afc_client_t *client); diff --git a/include/libimobiledevice/file_relay.h b/include/libimobiledevice/file_relay.h index 268eed8..dd65b38 100644 --- a/include/libimobiledevice/file_relay.h +++ b/include/libimobiledevice/file_relay.h @@ -41,8 +41,8 @@ extern "C" { typedef int16_t file_relay_error_t; -struct file_relay_client_int; -typedef struct file_relay_client_int *file_relay_client_t; +typedef struct file_relay_client_private file_relay_client_private; +typedef file_relay_client_private *file_relay_client_t; /**< The client handle. */ file_relay_error_t file_relay_client_new(idevice_t device, uint16_t port, file_relay_client_t *client); file_relay_error_t file_relay_client_free(file_relay_client_t client); diff --git a/include/libimobiledevice/installation_proxy.h b/include/libimobiledevice/installation_proxy.h index 22e76b1..8a7cfb9 100644 --- a/include/libimobiledevice/installation_proxy.h +++ b/include/libimobiledevice/installation_proxy.h @@ -42,8 +42,8 @@ extern "C" { typedef int16_t instproxy_error_t; -struct instproxy_client_int; -typedef struct instproxy_client_int *instproxy_client_t; +typedef struct instproxy_client_private instproxy_client_private; +typedef instproxy_client_private *instproxy_client_t; /**< The client handle. */ typedef void (*instproxy_status_cb_t) (const char *operation, plist_t status); diff --git a/include/libimobiledevice/libimobiledevice.h b/include/libimobiledevice/libimobiledevice.h index 87b078a..73e82fe 100644 --- a/include/libimobiledevice/libimobiledevice.h +++ b/include/libimobiledevice/libimobiledevice.h @@ -43,11 +43,11 @@ extern "C" { typedef int16_t idevice_error_t; -struct idevice_int; -typedef struct idevice_int *idevice_t; +typedef struct idevice_private idevice_private; +typedef idevice_private *idevice_t; /**< The device handle. */ -struct idevice_connection_int; -typedef struct idevice_connection_int *idevice_connection_t; +typedef struct idevice_connection_private idevice_connection_private; +typedef idevice_connection_private *idevice_connection_t; /**< The connection handle. */ /* generic */ void idevice_set_debug_level(int level); diff --git a/include/libimobiledevice/lockdown.h b/include/libimobiledevice/lockdown.h index bfdffad..6abf6d6 100644 --- a/include/libimobiledevice/lockdown.h +++ b/include/libimobiledevice/lockdown.h @@ -55,8 +55,8 @@ extern "C" { typedef int16_t lockdownd_error_t; -struct lockdownd_client_int; -typedef struct lockdownd_client_int *lockdownd_client_t; +typedef struct lockdownd_client_private lockdownd_client_private; +typedef lockdownd_client_private *lockdownd_client_t; /**< The client handle. */ struct lockdownd_pair_record { char *device_certificate; diff --git a/include/libimobiledevice/mobile_image_mounter.h b/include/libimobiledevice/mobile_image_mounter.h index 63dcb14..5681d8b 100644 --- a/include/libimobiledevice/mobile_image_mounter.h +++ b/include/libimobiledevice/mobile_image_mounter.h @@ -39,8 +39,8 @@ extern "C" { typedef int16_t mobile_image_mounter_error_t; -struct mobile_image_mounter_client_int; -typedef struct mobile_image_mounter_client_int *mobile_image_mounter_client_t; +typedef struct mobile_image_mounter_client_private mobile_image_mounter_client_private; +typedef mobile_image_mounter_client_private *mobile_image_mounter_client_t; /**< The client handle. */ /* Interface */ mobile_image_mounter_error_t mobile_image_mounter_new(idevice_t device, uint16_t port, mobile_image_mounter_client_t *client); diff --git a/include/libimobiledevice/mobilebackup.h b/include/libimobiledevice/mobilebackup.h index e29dbf4..d6f9013 100644 --- a/include/libimobiledevice/mobilebackup.h +++ b/include/libimobiledevice/mobilebackup.h @@ -41,8 +41,8 @@ extern "C" { typedef int16_t mobilebackup_error_t; -struct mobilebackup_client_int; -typedef struct mobilebackup_client_int *mobilebackup_client_t; +typedef struct mobilebackup_client_private mobilebackup_client_private; +typedef mobilebackup_client_private *mobilebackup_client_t; /**< The client handle. */ mobilebackup_error_t mobilebackup_client_new(idevice_t device, uint16_t port, mobilebackup_client_t * client); mobilebackup_error_t mobilebackup_client_free(mobilebackup_client_t client); diff --git a/include/libimobiledevice/mobilesync.h b/include/libimobiledevice/mobilesync.h index 349b6a3..2e330ee 100644 --- a/include/libimobiledevice/mobilesync.h +++ b/include/libimobiledevice/mobilesync.h @@ -40,8 +40,8 @@ extern "C" { typedef int16_t mobilesync_error_t; -struct mobilesync_client_int; -typedef struct mobilesync_client_int *mobilesync_client_t; +typedef struct mobilesync_client_private mobilesync_client_private; +typedef mobilesync_client_private *mobilesync_client_t; /**< The client handle */ mobilesync_error_t mobilesync_client_new(idevice_t device, uint16_t port, mobilesync_client_t * client); mobilesync_error_t mobilesync_client_free(mobilesync_client_t client); diff --git a/include/libimobiledevice/notification_proxy.h b/include/libimobiledevice/notification_proxy.h index 4f4c1fd..fa69088 100644 --- a/include/libimobiledevice/notification_proxy.h +++ b/include/libimobiledevice/notification_proxy.h @@ -68,8 +68,8 @@ typedef int16_t np_error_t; #define NP_LANGUAGE_CHANGED "com.apple.language.changed" #define NP_ADDRESS_BOOK_PREF_CHANGED "com.apple.AddressBook.PreferenceChanged" -struct np_client_int; -typedef struct np_client_int *np_client_t; +typedef struct np_client_private np_client_private; +typedef np_client_private *np_client_t; /**< The client handle. */ typedef void (*np_notify_cb_t) (const char *notification, void *userdata); diff --git a/include/libimobiledevice/sbservices.h b/include/libimobiledevice/sbservices.h index 2923082..0fcec86 100644 --- a/include/libimobiledevice/sbservices.h +++ b/include/libimobiledevice/sbservices.h @@ -39,8 +39,8 @@ extern "C" { typedef int16_t sbservices_error_t; -struct sbservices_client_int; -typedef struct sbservices_client_int *sbservices_client_t; +typedef struct sbservices_client_private sbservices_client_private; +typedef sbservices_client_private *sbservices_client_t; /**< The client handle. */ /* Interface */ sbservices_error_t sbservices_client_new(idevice_t device, uint16_t port, sbservices_client_t *client); diff --git a/include/libimobiledevice/screenshotr.h b/include/libimobiledevice/screenshotr.h index 077f50c..d9a3ffd 100644 --- a/include/libimobiledevice/screenshotr.h +++ b/include/libimobiledevice/screenshotr.h @@ -40,8 +40,8 @@ extern "C" { typedef int16_t screenshotr_error_t; -struct screenshotr_client_int; -typedef struct screenshotr_client_int *screenshotr_client_t; +typedef struct screenshotr_client_private screenshotr_client_private; +typedef screenshotr_client_private *screenshotr_client_t; /**< The client handle. */ screenshotr_error_t screenshotr_client_new(idevice_t device, uint16_t port, screenshotr_client_t * client); screenshotr_error_t screenshotr_client_free(screenshotr_client_t client); @@ -76,7 +76,7 @@ afc_error_t afc_client_new(idevice_t device, uint16_t port, afc_client_t * clien return AFC_E_MUX_ERROR; } - afc_client_t client_loc = (afc_client_t) malloc(sizeof(struct afc_client_int)); + afc_client_t client_loc = (afc_client_t) malloc(sizeof(struct afc_client_private)); client_loc->connection = connection; /* allocate a packet */ @@ -52,7 +52,7 @@ typedef struct { uint64_t filehandle, size; } AFCFilePacket; -struct afc_client_int { +struct afc_client_private { idevice_connection_t connection; AFCPacket *afc_packet; int file_handle; diff --git a/src/device_link_service.c b/src/device_link_service.c index 430b1db..a5befc7 100644 --- a/src/device_link_service.c +++ b/src/device_link_service.c @@ -90,7 +90,7 @@ device_link_service_error_t device_link_service_client_new(idevice_t device, uin } /* create client object */ - device_link_service_client_t client_loc = (device_link_service_client_t) malloc(sizeof(struct device_link_service_client_int)); + device_link_service_client_t client_loc = (device_link_service_client_t) malloc(sizeof(struct device_link_service_client_private)); client_loc->parent = plistclient; /* all done, return success */ diff --git a/src/device_link_service.h b/src/device_link_service.h index 4e652c4..c80686d 100644 --- a/src/device_link_service.h +++ b/src/device_link_service.h @@ -33,13 +33,12 @@ #define DEVICE_LINK_SERVICE_E_UNKNOWN_ERROR -256 -struct device_link_service_client_int { +struct device_link_service_client_private { property_list_service_client_t parent; }; -typedef struct device_link_service_client_int *device_link_service_client_t; - typedef int16_t device_link_service_error_t; +typedef struct device_link_service_client_private *device_link_service_client_t; device_link_service_error_t device_link_service_client_new(idevice_t device, uint16_t port, device_link_service_client_t *client); device_link_service_error_t device_link_service_client_free(device_link_service_client_t client); diff --git a/src/file_relay.c b/src/file_relay.c index 067384f..680e28d 100644 --- a/src/file_relay.c +++ b/src/file_relay.c @@ -48,7 +48,7 @@ file_relay_error_t file_relay_client_new(idevice_t device, uint16_t port, file_r } /* create client object */ - file_relay_client_t client_loc = (file_relay_client_t) malloc(sizeof(struct file_relay_client_int)); + file_relay_client_t client_loc = (file_relay_client_t) malloc(sizeof(struct file_relay_client_private)); client_loc->parent = plistclient; /* all done, return success */ diff --git a/src/file_relay.h b/src/file_relay.h index e1a133d..60cc32f 100644 --- a/src/file_relay.h +++ b/src/file_relay.h @@ -33,7 +33,7 @@ #define FILE_RELAY_E_UNKNOWN_ERROR -256 -struct file_relay_client_int { +struct file_relay_client_private { property_list_service_client_t parent; }; diff --git a/src/idevice.c b/src/idevice.c index c5050d5..0bdf3f5 100644 --- a/src/idevice.c +++ b/src/idevice.c @@ -160,7 +160,7 @@ idevice_error_t idevice_new(idevice_t * device, const char *uuid) usbmuxd_device_info_t muxdev; int res = usbmuxd_get_device_by_uuid(uuid, &muxdev); if (res > 0) { - idevice_t phone = (idevice_t) malloc(sizeof(struct idevice_int)); + idevice_t phone = (idevice_t) malloc(sizeof(struct idevice_private)); phone->uuid = strdup(muxdev.uuid); phone->conn_type = CONNECTION_USBMUXD; phone->conn_data = (void*)muxdev.handle; @@ -220,7 +220,7 @@ idevice_error_t idevice_connect(idevice_t device, uint16_t port, idevice_connect debug_info("ERROR: Connecting to usbmuxd failed: %d (%s)", sfd, strerror(-sfd)); return IDEVICE_E_UNKNOWN_ERROR; } - idevice_connection_t new_connection = (idevice_connection_t)malloc(sizeof(struct idevice_connection_int)); + idevice_connection_t new_connection = (idevice_connection_t)malloc(sizeof(struct idevice_connection_private)); new_connection->type = CONNECTION_USBMUXD; new_connection->data = (void*)sfd; new_connection->ssl_data = NULL; @@ -536,7 +536,7 @@ idevice_error_t idevice_connection_enable_ssl(idevice_connection_t connection) idevice_error_t ret = IDEVICE_E_SSL_ERROR; uint32_t return_me = 0; - ssl_data_t ssl_data_loc = (ssl_data_t)malloc(sizeof(struct ssl_data_int)); + ssl_data_t ssl_data_loc = (ssl_data_t)malloc(sizeof(struct ssl_data_private)); // Set up GnuTLS... debug_info("enabling SSL mode"); diff --git a/src/idevice.h b/src/idevice.h index 4aab440..5d83e4c 100644 --- a/src/idevice.h +++ b/src/idevice.h @@ -30,19 +30,19 @@ enum connection_type { CONNECTION_USBMUXD = 1 }; -struct ssl_data_int { +struct ssl_data_private { gnutls_certificate_credentials_t certificate; gnutls_session_t session; }; -typedef struct ssl_data_int *ssl_data_t; +typedef struct ssl_data_private *ssl_data_t; -struct idevice_connection_int { +struct idevice_connection_private { enum connection_type type; void *data; ssl_data_t ssl_data; }; -struct idevice_int { +struct idevice_private { char *uuid; enum connection_type conn_type; void *conn_data; diff --git a/src/installation_proxy.c b/src/installation_proxy.c index 9fb5109..40e4bc5 100644 --- a/src/installation_proxy.c +++ b/src/installation_proxy.c @@ -108,7 +108,7 @@ instproxy_error_t instproxy_client_new(idevice_t device, uint16_t port, instprox return INSTPROXY_E_CONN_FAILED; } - instproxy_client_t client_loc = (instproxy_client_t) malloc(sizeof(struct instproxy_client_int)); + instproxy_client_t client_loc = (instproxy_client_t) malloc(sizeof(struct instproxy_client_private)); client_loc->parent = plistclient; client_loc->mutex = g_mutex_new(); client_loc->status_updater = NULL; diff --git a/src/installation_proxy.h b/src/installation_proxy.h index 91eed2b..b497d62 100644 --- a/src/installation_proxy.h +++ b/src/installation_proxy.h @@ -26,7 +26,7 @@ #include "libimobiledevice/installation_proxy.h" #include "property_list_service.h" -struct instproxy_client_int { +struct instproxy_client_private { property_list_service_client_t parent; GMutex *mutex; GThread *status_updater; diff --git a/src/lockdown.c b/src/lockdown.c index 512ec9e..25a6c6a 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -591,7 +591,7 @@ lockdownd_error_t lockdownd_client_new(idevice_t device, lockdownd_client_t *cli return LOCKDOWN_E_MUX_ERROR; } - lockdownd_client_t client_loc = (lockdownd_client_t) malloc(sizeof(struct lockdownd_client_int)); + lockdownd_client_t client_loc = (lockdownd_client_t) malloc(sizeof(struct lockdownd_client_private)); client_loc->parent = plistclient; client_loc->ssl_enabled = 0; client_loc->session_id = NULL; diff --git a/src/lockdown.h b/src/lockdown.h index f515f7f..bf3ac38 100644 --- a/src/lockdown.h +++ b/src/lockdown.h @@ -28,7 +28,7 @@ #include "libimobiledevice/lockdown.h" #include "property_list_service.h" -struct lockdownd_client_int { +struct lockdownd_client_private { property_list_service_client_t parent; int ssl_enabled; char *session_id; diff --git a/src/mobile_image_mounter.c b/src/mobile_image_mounter.c index 88b6c47..9c50084 100644 --- a/src/mobile_image_mounter.c +++ b/src/mobile_image_mounter.c @@ -104,7 +104,7 @@ mobile_image_mounter_error_t mobile_image_mounter_new(idevice_t device, uint16_t return MOBILE_IMAGE_MOUNTER_E_CONN_FAILED; } - mobile_image_mounter_client_t client_loc = (mobile_image_mounter_client_t) malloc(sizeof(struct mobile_image_mounter_client_int)); + mobile_image_mounter_client_t client_loc = (mobile_image_mounter_client_t) malloc(sizeof(struct mobile_image_mounter_client_private)); client_loc->parent = plistclient; client_loc->mutex = g_mutex_new(); diff --git a/src/mobile_image_mounter.h b/src/mobile_image_mounter.h index da8bf3e..2615dbc 100644 --- a/src/mobile_image_mounter.h +++ b/src/mobile_image_mounter.h @@ -26,7 +26,7 @@ #include "libimobiledevice/mobile_image_mounter.h" #include "property_list_service.h" -struct mobile_image_mounter_client_int { +struct mobile_image_mounter_client_private { property_list_service_client_t parent; GMutex *mutex; }; diff --git a/src/mobilebackup.c b/src/mobilebackup.c index d4f36d6..c5f0a84 100644 --- a/src/mobilebackup.c +++ b/src/mobilebackup.c @@ -71,7 +71,7 @@ mobilebackup_error_t mobilebackup_client_new(idevice_t device, uint16_t port, return ret; } - mobilebackup_client_t client_loc = (mobilebackup_client_t) malloc(sizeof(struct mobilebackup_client_int)); + mobilebackup_client_t client_loc = (mobilebackup_client_t) malloc(sizeof(struct mobilebackup_client_private)); client_loc->parent = dlclient; /* perform handshake */ diff --git a/src/mobilebackup.h b/src/mobilebackup.h index 8f58236..2c5be62 100644 --- a/src/mobilebackup.h +++ b/src/mobilebackup.h @@ -24,7 +24,7 @@ #include "libimobiledevice/mobilebackup.h" #include "device_link_service.h" -struct mobilebackup_client_int { +struct mobilebackup_client_private { device_link_service_client_t parent; }; diff --git a/src/mobilesync.c b/src/mobilesync.c index fec97bc..88d8497 100644 --- a/src/mobilesync.c +++ b/src/mobilesync.c @@ -71,7 +71,7 @@ mobilesync_error_t mobilesync_client_new(idevice_t device, uint16_t port, return ret; } - mobilesync_client_t client_loc = (mobilesync_client_t) malloc(sizeof(struct mobilesync_client_int)); + mobilesync_client_t client_loc = (mobilesync_client_t) malloc(sizeof(struct mobilesync_client_private)); client_loc->parent = dlclient; /* perform handshake */ diff --git a/src/mobilesync.h b/src/mobilesync.h index defb3f4..8317c69 100644 --- a/src/mobilesync.h +++ b/src/mobilesync.h @@ -24,7 +24,7 @@ #include "libimobiledevice/mobilesync.h" #include "device_link_service.h" -struct mobilesync_client_int { +struct mobilesync_client_private { device_link_service_client_t parent; }; diff --git a/src/notification_proxy.c b/src/notification_proxy.c index 41647c8..b82378a 100644 --- a/src/notification_proxy.c +++ b/src/notification_proxy.c @@ -110,7 +110,7 @@ np_error_t np_client_new(idevice_t device, uint16_t port, np_client_t *client) return NP_E_CONN_FAILED; } - np_client_t client_loc = (np_client_t) malloc(sizeof(struct np_client_int)); + np_client_t client_loc = (np_client_t) malloc(sizeof(struct np_client_private)); client_loc->parent = plistclient; client_loc->mutex = g_mutex_new(); diff --git a/src/notification_proxy.h b/src/notification_proxy.h index 442f5d8..8d5cd24 100644 --- a/src/notification_proxy.h +++ b/src/notification_proxy.h @@ -26,7 +26,7 @@ #include "libimobiledevice/notification_proxy.h" #include "property_list_service.h" -struct np_client_int { +struct np_client_private { property_list_service_client_t parent; GMutex *mutex; GThread *notifier; diff --git a/src/property_list_service.c b/src/property_list_service.c index 68aa455..56e735b 100644 --- a/src/property_list_service.c +++ b/src/property_list_service.c @@ -76,7 +76,7 @@ property_list_service_error_t property_list_service_client_new(idevice_t device, } /* create client object */ - property_list_service_client_t client_loc = (property_list_service_client_t)malloc(sizeof(struct property_list_service_client_int)); + property_list_service_client_t client_loc = (property_list_service_client_t)malloc(sizeof(struct property_list_service_client_private)); client_loc->connection = connection; *client = client_loc; diff --git a/src/property_list_service.h b/src/property_list_service.h index 70d8793..037f9aa 100644 --- a/src/property_list_service.h +++ b/src/property_list_service.h @@ -32,11 +32,11 @@ #define PROPERTY_LIST_SERVICE_E_UNKNOWN_ERROR -256 -struct property_list_service_client_int { +struct property_list_service_client_private { idevice_connection_t connection; }; -typedef struct property_list_service_client_int *property_list_service_client_t; +typedef struct property_list_service_client_private *property_list_service_client_t; typedef int16_t property_list_service_error_t; diff --git a/src/sbservices.c b/src/sbservices.c index 25602d3..91f4b9c 100644 --- a/src/sbservices.c +++ b/src/sbservices.c @@ -103,7 +103,7 @@ sbservices_error_t sbservices_client_new(idevice_t device, uint16_t port, sbserv return err; } - sbservices_client_t client_loc = (sbservices_client_t) malloc(sizeof(struct sbservices_client_int)); + sbservices_client_t client_loc = (sbservices_client_t) malloc(sizeof(struct sbservices_client_private)); client_loc->parent = plistclient; client_loc->mutex = g_mutex_new(); diff --git a/src/sbservices.h b/src/sbservices.h index 7be1447..3a4120f 100644 --- a/src/sbservices.h +++ b/src/sbservices.h @@ -26,7 +26,7 @@ #include "libimobiledevice/sbservices.h" #include "property_list_service.h" -struct sbservices_client_int { +struct sbservices_client_private { property_list_service_client_t parent; GMutex *mutex; }; diff --git a/src/screenshotr.c b/src/screenshotr.c index 07c51ca..380d28c 100644 --- a/src/screenshotr.c +++ b/src/screenshotr.c @@ -86,7 +86,7 @@ screenshotr_error_t screenshotr_client_new(idevice_t device, uint16_t port, return ret; } - screenshotr_client_t client_loc = (screenshotr_client_t) malloc(sizeof(struct screenshotr_client_int)); + screenshotr_client_t client_loc = (screenshotr_client_t) malloc(sizeof(struct screenshotr_client_private)); client_loc->parent = dlclient; /* perform handshake */ diff --git a/src/screenshotr.h b/src/screenshotr.h index 97172dc..5ba93b0 100644 --- a/src/screenshotr.h +++ b/src/screenshotr.h @@ -24,7 +24,7 @@ #include "libimobiledevice/screenshotr.h" #include "device_link_service.h" -struct screenshotr_client_int { +struct screenshotr_client_private { device_link_service_client_t parent; }; |