From 7457346a7ad7dddc0188cd1cd6fc5920aabfe39a Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Thu, 22 Mar 2012 16:07:07 +0100
Subject: Mass replace UUID by UDID, which is the correct term for it

---
 dev/housearresttest.c | 10 +++++-----
 dev/ideviceclient.c   | 10 +++++-----
 dev/lckdclient.c      | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'dev')

diff --git a/dev/housearresttest.c b/dev/housearresttest.c
index 7282a8c..951ebe4 100644
--- a/dev/housearresttest.c
+++ b/dev/housearresttest.c
@@ -35,7 +35,7 @@ static void print_usage(int argc, char **argv)
 	printf("Usage: %s [OPTIONS] APPID\n", (name ? name + 1: argv[0]));
 	printf("Test the house_arrest service.\n\n");
 	printf("  -d, --debug\t\tenable communication debugging\n");
-	printf("  -u, --uuid UUID\ttarget specific device by its 40-digit device UUID\n");
+	printf("  -u, --udid UDID\ttarget specific device by its 40-digit device UDID\n");
 	printf("  -t, --test\t\ttest creating, writing, and deleting a file\n");
 	printf("  -h, --help\t\tprints usage information\n");
 	printf("\n");
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 	house_arrest_client_t hac = NULL;
 	house_arrest_error_t res;
 	int i;
-	char *uuid = NULL;
+	char *udid = NULL;
 	const char *appid = NULL;
 	int test_file_io = 0;
 
@@ -58,13 +58,13 @@ int main(int argc, char **argv)
 			idevice_set_debug_level(1);
 			continue;
 		}
-		else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--uuid")) {
+		else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--udid")) {
 			i++;
 			if (!argv[i] || (strlen(argv[i]) != 40)) {
 				print_usage(argc, argv);
 				return 0;
 			}
-			uuid = strdup(argv[i]);
+			udid = strdup(argv[i]);
 			continue;
 		}
 		else if (!strcmp(argv[i], "-t") || !strcmp(argv[i], "--test")) {
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
-	if (idevice_new(&dev, uuid) != IDEVICE_E_SUCCESS) {
+	if (idevice_new(&dev, udid) != IDEVICE_E_SUCCESS) {
 		printf("no device connected?!\n");
 		goto leave_cleanup;
 	}
diff --git a/dev/ideviceclient.c b/dev/ideviceclient.c
index c7bde4d..d467ee8 100644
--- a/dev/ideviceclient.c
+++ b/dev/ideviceclient.c
@@ -83,12 +83,12 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	char *uuid = NULL;
-	if (IDEVICE_E_SUCCESS == idevice_get_uuid(phone, &uuid)) {
-		printf("DeviceUniqueID : %s\n", uuid);
+	char *udid = NULL;
+	if (IDEVICE_E_SUCCESS == idevice_get_udid(phone, &udid)) {
+		printf("DeviceUniqueID : %s\n", udid);
 	}
-	if (uuid)
-		free(uuid);
+	if (udid)
+		free(udid);
 
 	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(phone, &client, "ideviceclient")) {
 		idevice_free(phone);
diff --git a/dev/lckdclient.c b/dev/lckdclient.c
index 5ca72f8..cc89634 100644
--- a/dev/lckdclient.c
+++ b/dev/lckdclient.c
@@ -88,12 +88,12 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	char *uuid = NULL;
-	if (IDEVICE_E_SUCCESS == idevice_get_uuid(phone, &uuid)) {
-		printf("DeviceUniqueID : %s\n", uuid);
+	char *udid = NULL;
+	if (IDEVICE_E_SUCCESS == idevice_get_udid(phone, &udid)) {
+		printf("DeviceUniqueID : %s\n", udid);
 	}
-	if (uuid)
-		free(uuid);
+	if (udid)
+		free(udid);
 
 	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(phone, &client, "lckdclient")) {
 		idevice_free(phone);
-- 
cgit v1.1-32-gdbae