diff options
| -rw-r--r-- | src/heartbeat.c | 2 | ||||
| -rw-r--r-- | src/service.c | 6 | ||||
| -rw-r--r-- | src/service.h | 4 | ||||
| -rw-r--r-- | src/webinspector.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/heartbeat.c b/src/heartbeat.c index 791cdb2..5645b3e 100644 --- a/src/heartbeat.c +++ b/src/heartbeat.c @@ -113,7 +113,7 @@ heartbeat_error_t heartbeat_client_new(idevice_t device, lockdownd_service_descr heartbeat_error_t heartbeat_client_start_service(idevice_t device, heartbeat_client_t * client, const char* label) { heartbeat_error_t err = HEARTBEAT_E_UNKNOWN_ERROR; - service_client_factory_start_service(device, HEARTBEAT_SERVICE_NAME, (void**)client, label, SERVICE_CONSTRUCTOR(heartbeat_client_new), (uint16_t*)&err); + service_client_factory_start_service(device, HEARTBEAT_SERVICE_NAME, (void**)client, label, SERVICE_CONSTRUCTOR(heartbeat_client_new), (int16_t*)&err); return err; } diff --git a/src/service.c b/src/service.c index 738db02..959c9fb 100644 --- a/src/service.c +++ b/src/service.c @@ -103,7 +103,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_client_factory_start_service(idevice_t device, const char* service_name, void **client, const char* label, uint16_t (*constructor_func)(idevice_t, lockdownd_service_descriptor_t, void**), uint16_t *error_code) +service_error_t service_client_factory_start_service(idevice_t device, const char* service_name, void **client, const char* label, int16_t (*constructor_func)(idevice_t, lockdownd_service_descriptor_t, void**), int16_t *error_code) { *client = NULL; @@ -122,9 +122,9 @@ service_error_t service_client_factory_start_service(idevice_t device, const cha return SERVICE_E_START_SERVICE_ERROR; } - uint16_t ec; + int16_t ec; if (constructor_func) { - ec = (uint16_t)constructor_func(device, service, client); + ec = (int16_t)constructor_func(device, service, client); } else { ec = service_client_new(device, service, (service_client_t*)client); } diff --git a/src/service.h b/src/service.h index 3a22bed..8cea7a3 100644 --- a/src/service.h +++ b/src/service.h @@ -40,11 +40,11 @@ typedef struct service_client_private *service_client_t; typedef int16_t service_error_t; -#define SERVICE_CONSTRUCTOR(x) (uint16_t (*)(idevice_t, lockdownd_service_descriptor_t, void**))(x) +#define SERVICE_CONSTRUCTOR(x) (int16_t (*)(idevice_t, lockdownd_service_descriptor_t, void**))(x) /* 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_client_factory_start_service(idevice_t device, const char* service_name, void **client, const char* label, uint16_t (*constructor_func)(idevice_t, lockdownd_service_descriptor_t, void**), uint16_t *error_code); +service_error_t service_client_factory_start_service(idevice_t device, const char* service_name, void **client, const char* label, int16_t (*constructor_func)(idevice_t, lockdownd_service_descriptor_t, void**), int16_t *error_code); service_error_t service_client_free(service_client_t client); /* sending */ diff --git a/src/webinspector.c b/src/webinspector.c index 40ce7dd..0be69dd 100644 --- a/src/webinspector.c +++ b/src/webinspector.c @@ -113,7 +113,7 @@ webinspector_error_t webinspector_client_new(idevice_t device, lockdownd_service webinspector_error_t webinspector_client_start_service(idevice_t device, webinspector_client_t * client, const char* label) { webinspector_error_t err = WEBINSPECTOR_E_UNKNOWN_ERROR; - service_client_factory_start_service(device, WEBINSPECTOR_SERVICE_NAME, (void**)client, label, SERVICE_CONSTRUCTOR(webinspector_client_new), (uint16_t*)&err); + service_client_factory_start_service(device, WEBINSPECTOR_SERVICE_NAME, (void**)client, label, SERVICE_CONSTRUCTOR(webinspector_client_new), (int16_t*)&err); return err; } |