From a86d3e055f39836f64696f7cf50a6c99bd242a2a Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Sun, 21 Oct 2012 16:54:48 +0200
Subject: Rename "uuid" to correct "udid" abbreviation for "unique device
 identifier"

---
 src/ideviceinstaller.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ideviceinstaller.c b/src/ideviceinstaller.c
index 7b088c3..1d3f383 100644
--- a/src/ideviceinstaller.c
+++ b/src/ideviceinstaller.c
@@ -48,7 +48,7 @@
 const char PKG_PATH[] = "PublicStaging";
 const char APPARCH_PATH[] = "ApplicationArchives";
 
-char *uuid = NULL;
+char *udid = NULL;
 char *options = NULL;
 char *appid = NULL;
 
@@ -205,7 +205,7 @@ static void print_usage(int argc, char **argv)
 	printf("Usage: %s OPTIONS\n", (name ? name + 1 : argv[0]));
 	printf("Manage apps on an iDevice.\n\n");
 	printf
-		("  -U, --uuid UUID\tTarget specific device by its 40-digit device UUID.\n"
+		("  -U, --udid UDID\tTarget specific device by its 40-digit device UDID.\n"
 		 "  -l, --list-apps\tList apps, possible options:\n"
 		 "       -o list_user\t- list user apps only (this is the default)\n"
 		 "       -o list_system\t- list system apps only\n"
@@ -234,7 +234,7 @@ static void parse_opts(int argc, char **argv)
 {
 	static struct option longopts[] = {
 		{"help", 0, NULL, 'h'},
-		{"uuid", 1, NULL, 'U'},
+		{"udid", 1, NULL, 'U'},
 		{"list-apps", 0, NULL, 'l'},
 		{"install", 1, NULL, 'i'},
 		{"uninstall", 1, NULL, 'u'},
@@ -262,12 +262,12 @@ static void parse_opts(int argc, char **argv)
 			exit(0);
 		case 'U':
 			if (strlen(optarg) != 40) {
-				printf("%s: invalid UUID specified (length != 40)\n",
+				printf("%s: invalid UDID specified (length != 40)\n",
 					   argv[0]);
 				print_usage(argc, argv);
 				exit(2);
 			}
-			uuid = strdup(optarg);
+			udid = strdup(optarg);
 			break;
 		case 'l':
 			list_apps_mode = 1;
@@ -341,7 +341,7 @@ int main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (IDEVICE_E_SUCCESS != idevice_new(&phone, uuid)) {
+	if (IDEVICE_E_SUCCESS != idevice_new(&phone, udid)) {
 		fprintf(stderr, "No iPhone found, is it plugged in?\n");
 		return -1;
 	}
@@ -1178,8 +1178,8 @@ run_again:
 	}
 	idevice_free(phone);
 
-	if (uuid) {
-		free(uuid);
+	if (udid) {
+		free(udid);
 	}
 	if (appid) {
 		free(appid);
-- 
cgit v1.1-32-gdbae