summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2013-02-26 19:58:12 +0100
committerGravatar Martin Szulecki2013-02-27 16:18:15 +0100
commitbd6a2860e9b6764c2073d1159ef3070df7f036d8 (patch)
treede2489b8469921fb67e196fd0ead88fcbdeb638b
parentf8066bbf5169b7d7e68771bce677355e33a595c1 (diff)
downloadlibimobiledevice-bd6a2860e9b6764c2073d1159ef3070df7f036d8.tar.gz
libimobiledevice-bd6a2860e9b6764c2073d1159ef3070df7f036d8.tar.bz2
Rename start service methods to be consistent
-rw-r--r--dev/ideviceheartbeat.c2
-rw-r--r--include/libimobiledevice/heartbeat.h3
-rw-r--r--include/libimobiledevice/webinspector.h3
-rw-r--r--src/heartbeat.c2
-rw-r--r--src/service.c2
-rw-r--r--src/service.h2
-rw-r--r--src/webinspector.c2
7 files changed, 7 insertions, 9 deletions
diff --git a/dev/ideviceheartbeat.c b/dev/ideviceheartbeat.c
index aecf9a0..4fb56ff 100644
--- a/dev/ideviceheartbeat.c
+++ b/dev/ideviceheartbeat.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
}
/* start heartbeat service on device */
- heartbeat_start_service(device, &heartbeat);
+ heartbeat_client_start_service(device, &heartbeat);
if (heartbeat) {
printf("< heartbeat started, listening...\n");
diff --git a/include/libimobiledevice/heartbeat.h b/include/libimobiledevice/heartbeat.h
index e5adb0d..611a2dd 100644
--- a/include/libimobiledevice/heartbeat.h
+++ b/include/libimobiledevice/heartbeat.h
@@ -49,10 +49,9 @@ typedef struct heartbeat_client_private heartbeat_client_private;
typedef heartbeat_client_private *heartbeat_client_t; /**< The client handle. */
heartbeat_error_t heartbeat_client_new(idevice_t device, lockdownd_service_descriptor_t service, heartbeat_client_t * client);
+heartbeat_error_t heartbeat_client_start_service(idevice_t device, heartbeat_client_t * client);
heartbeat_error_t heartbeat_client_free(heartbeat_client_t client);
-heartbeat_error_t heartbeat_start_service(idevice_t device, heartbeat_client_t * client);
-
heartbeat_error_t heartbeat_send(heartbeat_client_t client, plist_t plist);
heartbeat_error_t heartbeat_receive(heartbeat_client_t client, plist_t * plist);
heartbeat_error_t heartbeat_receive_with_timeout(heartbeat_client_t client, plist_t * plist, uint32_t timeout_ms);
diff --git a/include/libimobiledevice/webinspector.h b/include/libimobiledevice/webinspector.h
index ed9faad..a6e8541 100644
--- a/include/libimobiledevice/webinspector.h
+++ b/include/libimobiledevice/webinspector.h
@@ -49,10 +49,9 @@ typedef struct webinspector_client_private webinspector_client_private;
typedef webinspector_client_private *webinspector_client_t; /**< The client handle. */
webinspector_error_t webinspector_client_new(idevice_t device, lockdownd_service_descriptor_t service, webinspector_client_t * client);
+webinspector_error_t webinspector_client_start_service(idevice_t device, webinspector_client_t * client);
webinspector_error_t webinspector_client_free(webinspector_client_t client);
-webinspector_error_t webinspector_start_service(idevice_t device, webinspector_client_t * client);
-
webinspector_error_t webinspector_send(webinspector_client_t client, plist_t plist);
webinspector_error_t webinspector_receive(webinspector_client_t client, plist_t * plist);
webinspector_error_t webinspector_receive_with_timeout(webinspector_client_t client, plist_t * plist, uint32_t timeout_ms);
diff --git a/src/heartbeat.c b/src/heartbeat.c
index c97c178..30fb8af 100644
--- a/src/heartbeat.c
+++ b/src/heartbeat.c
@@ -108,7 +108,7 @@ heartbeat_error_t heartbeat_client_new(idevice_t device, lockdownd_service_descr
* @return HEARTBEAT_E_SUCCESS on success, or an HEARTBEAT_E_* error
* code otherwise.
*/
-heartbeat_error_t heartbeat_start_service(idevice_t device, heartbeat_client_t * client)
+heartbeat_error_t heartbeat_client_start_service(idevice_t device, heartbeat_client_t * client)
{
*client = NULL;
diff --git a/src/service.c b/src/service.c
index 929beff..09a312b 100644
--- a/src/service.c
+++ b/src/service.c
@@ -101,7 +101,7 @@ service_error_t service_client_new(idevice_t device, lockdownd_service_descripto
* @return SERVICE_E_SUCCESS on success, or a SERVICE_E_* error code
* otherwise.
*/
-service_error_t service_start_service(idevice_t device, const char* service_name, service_client_t *client)
+service_error_t service_client_start_service(idevice_t device, const char* service_name, service_client_t *client)
{
*client = NULL;
diff --git a/src/service.h b/src/service.h
index e498ed7..e95d589 100644
--- a/src/service.h
+++ b/src/service.h
@@ -42,7 +42,7 @@ typedef int16_t service_error_t;
/* creation and destruction */
service_error_t service_client_new(idevice_t device, lockdownd_service_descriptor_t service, service_client_t *client);
-service_error_t service_start_service(idevice_t device, const char* service_name, service_client_t *client);
+service_error_t service_client_start_service(idevice_t device, const char* service_name, service_client_t *client);
service_error_t service_client_free(service_client_t client);
/* sending */
diff --git a/src/webinspector.c b/src/webinspector.c
index eb12d4d..1b39ea0 100644
--- a/src/webinspector.c
+++ b/src/webinspector.c
@@ -108,7 +108,7 @@ webinspector_error_t webinspector_client_new(idevice_t device, lockdownd_service
* @return WEBINSPECTOR_E_SUCCESS on success, or an WEBINSPECTOR_E_* error
* code otherwise.
*/
-webinspector_error_t webinspector_start_service(idevice_t device, webinspector_client_t * client)
+webinspector_error_t webinspector_client_start_service(idevice_t device, webinspector_client_t * client)
{
*client = NULL;