From caf76f8026a49ee1405ffa4d61c898f0138ba71d Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Sat, 10 Apr 2010 19:43:05 +0200 Subject: [PATCH] refactor lockdownd_client_new() Signed-off-by: Petr Uzel --- src/lockdown.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/lockdown.c b/src/lockdown.c index 60b57b1..33c4f35 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -607,8 +607,6 @@ lockdownd_error_t lockdownd_client_new(idevice_t device, lockdownd_client_t *cli if (!client) return LOCKDOWN_E_INVALID_ARG; - lockdownd_error_t ret = LOCKDOWN_E_SUCCESS; - property_list_service_client_t plistclient = NULL; if (property_list_service_client_new(device, 0xf27e, &plistclient) != PROPERTY_LIST_SERVICE_E_SUCCESS) { debug_info("could not connect to lockdownd (device %s)", device->uuid); @@ -620,17 +618,11 @@ lockdownd_error_t lockdownd_client_new(idevice_t device, lockdownd_client_t *cli client_loc->ssl_enabled = 0; client_loc->session_id = NULL; client_loc->uuid = NULL; - client_loc->label = NULL; - if (label != NULL) - strdup(label); + client_loc->label = label ? strdup(label) : NULL; - if (LOCKDOWN_E_SUCCESS == ret) { - *client = client_loc; - } else { - lockdownd_client_free(client_loc); - } + *client = client_loc; - return ret; + return LOCKDOWN_E_SUCCESS; } /** -- 1.7.0