diff options
| author | 2013-03-19 10:47:02 +0100 | |
|---|---|---|
| committer | 2013-03-19 10:47:02 +0100 | |
| commit | 2dfecc2ffb06407e4577fe5224952f5a130cdcae (patch) | |
| tree | 5a798f2e9c2306709a9c7cbb360c28561d9112a1 /tools/idevice_id.c | |
| parent | 1c7f29c7f1f5df0ffc65cbc329be73c39803df88 (diff) | |
| download | libimobiledevice-2dfecc2ffb06407e4577fe5224952f5a130cdcae.tar.gz libimobiledevice-2dfecc2ffb06407e4577fe5224952f5a130cdcae.tar.bz2 | |
idevice_id: Rename devname variable which shadows a global declaration on OS X
Diffstat (limited to 'tools/idevice_id.c')
| -rw-r--r-- | tools/idevice_id.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/idevice_id.c b/tools/idevice_id.c index c9ade46..edd1e84 100644 --- a/tools/idevice_id.c +++ b/tools/idevice_id.c | |||
| @@ -49,7 +49,7 @@ int main(int argc, char **argv) | |||
| 49 | idevice_t device = NULL; | 49 | idevice_t device = NULL; |
| 50 | lockdownd_client_t client = NULL; | 50 | lockdownd_client_t client = NULL; |
| 51 | char **dev_list = NULL; | 51 | char **dev_list = NULL; |
| 52 | char *devname = NULL; | 52 | char *device_name = NULL; |
| 53 | int ret = 0; | 53 | int ret = 0; |
| 54 | int i; | 54 | int i; |
| 55 | int mode = MODE_SHOW_ID; | 55 | int mode = MODE_SHOW_ID; |
| @@ -95,7 +95,7 @@ int main(int argc, char **argv) | |||
| 95 | return -2; | 95 | return -2; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | if ((LOCKDOWN_E_SUCCESS != lockdownd_get_device_name(client, &devname)) || !devname) { | 98 | if ((LOCKDOWN_E_SUCCESS != lockdownd_get_device_name(client, &device_name)) || !device_name) { |
| 99 | fprintf(stderr, "ERROR: Could not get device name!\n"); | 99 | fprintf(stderr, "ERROR: Could not get device name!\n"); |
| 100 | ret = -2; | 100 | ret = -2; |
| 101 | } | 101 | } |
| @@ -104,11 +104,11 @@ int main(int argc, char **argv) | |||
| 104 | idevice_free(device); | 104 | idevice_free(device); |
| 105 | 105 | ||
| 106 | if (ret == 0) { | 106 | if (ret == 0) { |
| 107 | printf("%s\n", devname); | 107 | printf("%s\n", device_name); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | if (devname) { | 110 | if (device_name) { |
| 111 | free(devname); | 111 | free(device_name); |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | return ret; | 114 | return ret; |
