From 36c0192fbb16d068214d2640aecfb731ea24bfaa Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Thu, 29 Nov 2012 03:42:06 +0100 Subject: tools: use pointer instead of static buffer for UDID since it can start with '0' --- tools/idevicediagnostics.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'tools/idevicediagnostics.c') diff --git a/tools/idevicediagnostics.c b/tools/idevicediagnostics.c index 3c7f0ac..10dab77 100644 --- a/tools/idevicediagnostics.c +++ b/tools/idevicediagnostics.c @@ -60,7 +60,7 @@ int main(int argc, char **argv) uint16_t port = 0; int result = -1; int i; - char *udid = NULL; + const char *udid = NULL; int cmd = CMD_NONE; char* cmd_arg = NULL; plist_t node = NULL; @@ -79,7 +79,7 @@ int main(int argc, char **argv) result = 0; goto cleanup; } - udid = strdup(argv[i]); + udid = argv[i]; continue; } else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) { @@ -165,14 +165,14 @@ int main(int argc, char **argv) } if (IDEVICE_E_SUCCESS != idevice_new(&device, udid)) { - printf("No device found, is it plugged in?\n"); + if (udid) { + printf("No device found with udid %s, is it plugged in?\n", udid); + } else { + printf("No device found, is it plugged in?\n"); + } goto cleanup; } - if (udid) { - free(udid); - } - if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(device, &lockdown_client, NULL)) { idevice_free(device); printf("Unable to connect to lockdownd.\n"); @@ -261,9 +261,6 @@ int main(int argc, char **argv) idevice_free(device); cleanup: - if (udid) { - free(udid); - } if (node) { plist_free(node); } -- cgit v1.1-32-gdbae