diff options
| author | 2012-03-22 16:07:07 +0100 | |
|---|---|---|
| committer | 2012-03-22 16:07:07 +0100 | |
| commit | 7457346a7ad7dddc0188cd1cd6fc5920aabfe39a (patch) | |
| tree | 4d9aa158fc2fb1e05d3349ca8a5ec22207a9a7e4 /tools/ideviceinfo.c | |
| parent | 0331050438d1bd5824237d13240a766a9b503b55 (diff) | |
| download | libimobiledevice-7457346a7ad7dddc0188cd1cd6fc5920aabfe39a.tar.gz libimobiledevice-7457346a7ad7dddc0188cd1cd6fc5920aabfe39a.tar.bz2 | |
Mass replace UUID by UDID, which is the correct term for it
Diffstat (limited to 'tools/ideviceinfo.c')
| -rw-r--r-- | tools/ideviceinfo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/ideviceinfo.c b/tools/ideviceinfo.c index 6633459..ca4b246 100644 --- a/tools/ideviceinfo.c +++ b/tools/ideviceinfo.c | |||
| @@ -256,7 +256,7 @@ static void print_usage(int argc, char **argv) | |||
| 256 | printf("Show information about a connected iPhone/iPod Touch.\n\n"); | 256 | printf("Show information about a connected iPhone/iPod Touch.\n\n"); |
| 257 | printf(" -d, --debug\t\tenable communication debugging\n"); | 257 | printf(" -d, --debug\t\tenable communication debugging\n"); |
| 258 | printf(" -s, --simple\t\tuse a simple connection to avoid auto-pairing with the device\n"); | 258 | printf(" -s, --simple\t\tuse a simple connection to avoid auto-pairing with the device\n"); |
| 259 | printf(" -u, --uuid UUID\ttarget specific device by its 40-digit device UUID\n"); | 259 | printf(" -u, --udid UDID\ttarget specific device by its 40-digit device UDID\n"); |
| 260 | printf(" -q, --domain NAME\tset domain of query to NAME. Default: None\n"); | 260 | printf(" -q, --domain NAME\tset domain of query to NAME. Default: None\n"); |
| 261 | printf(" -k, --key NAME\tonly query key specified by NAME. Default: All keys.\n"); | 261 | printf(" -k, --key NAME\tonly query key specified by NAME. Default: All keys.\n"); |
| 262 | printf(" -x, --xml\t\toutput information as xml plist instead of key/value pairs\n"); | 262 | printf(" -x, --xml\t\toutput information as xml plist instead of key/value pairs\n"); |
| @@ -277,14 +277,14 @@ int main(int argc, char *argv[]) | |||
| 277 | int i; | 277 | int i; |
| 278 | int simple = 0; | 278 | int simple = 0; |
| 279 | int format = FORMAT_KEY_VALUE; | 279 | int format = FORMAT_KEY_VALUE; |
| 280 | char uuid[41]; | 280 | char udid[41]; |
| 281 | char *domain = NULL; | 281 | char *domain = NULL; |
| 282 | char *key = NULL; | 282 | char *key = NULL; |
| 283 | char *xml_doc = NULL; | 283 | char *xml_doc = NULL; |
| 284 | uint32_t xml_length; | 284 | uint32_t xml_length; |
| 285 | plist_t node = NULL; | 285 | plist_t node = NULL; |
| 286 | plist_type node_type; | 286 | plist_type node_type; |
| 287 | uuid[0] = 0; | 287 | udid[0] = 0; |
| 288 | 288 | ||
| 289 | /* parse cmdline args */ | 289 | /* parse cmdline args */ |
| 290 | for (i = 1; i < argc; i++) { | 290 | for (i = 1; i < argc; i++) { |
| @@ -292,13 +292,13 @@ int main(int argc, char *argv[]) | |||
| 292 | idevice_set_debug_level(1); | 292 | idevice_set_debug_level(1); |
| 293 | continue; | 293 | continue; |
| 294 | } | 294 | } |
| 295 | else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--uuid")) { | 295 | else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--udid")) { |
| 296 | i++; | 296 | i++; |
| 297 | if (!argv[i] || (strlen(argv[i]) != 40)) { | 297 | if (!argv[i] || (strlen(argv[i]) != 40)) { |
| 298 | print_usage(argc, argv); | 298 | print_usage(argc, argv); |
| 299 | return 0; | 299 | return 0; |
| 300 | } | 300 | } |
| 301 | strcpy(uuid, argv[i]); | 301 | strcpy(udid, argv[i]); |
| 302 | continue; | 302 | continue; |
| 303 | } | 303 | } |
| 304 | else if (!strcmp(argv[i], "-q") || !strcmp(argv[i], "--domain")) { | 304 | else if (!strcmp(argv[i], "-q") || !strcmp(argv[i], "--domain")) { |
| @@ -340,10 +340,10 @@ int main(int argc, char *argv[]) | |||
| 340 | } | 340 | } |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | if (uuid[0] != 0) { | 343 | if (udid[0] != 0) { |
| 344 | ret = idevice_new(&phone, uuid); | 344 | ret = idevice_new(&phone, udid); |
| 345 | if (ret != IDEVICE_E_SUCCESS) { | 345 | if (ret != IDEVICE_E_SUCCESS) { |
| 346 | printf("No device found with uuid %s, is it plugged in?\n", uuid); | 346 | printf("No device found with udid %s, is it plugged in?\n", udid); |
| 347 | return -1; | 347 | return -1; |
| 348 | } | 348 | } |
| 349 | } | 349 | } |
