summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2013-03-19 10:47:02 +0100
committerGravatar Martin Szulecki2013-03-19 10:47:02 +0100
commit2dfecc2ffb06407e4577fe5224952f5a130cdcae (patch)
tree5a798f2e9c2306709a9c7cbb360c28561d9112a1
parent1c7f29c7f1f5df0ffc65cbc329be73c39803df88 (diff)
downloadlibimobiledevice-2dfecc2ffb06407e4577fe5224952f5a130cdcae.tar.gz
libimobiledevice-2dfecc2ffb06407e4577fe5224952f5a130cdcae.tar.bz2
idevice_id: Rename devname variable which shadows a global declaration on OS X
-rw-r--r--tools/idevice_id.c10
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)
idevice_t device = NULL;
lockdownd_client_t client = NULL;
char **dev_list = NULL;
- char *devname = NULL;
+ char *device_name = NULL;
int ret = 0;
int i;
int mode = MODE_SHOW_ID;
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
return -2;
}
- if ((LOCKDOWN_E_SUCCESS != lockdownd_get_device_name(client, &devname)) || !devname) {
+ if ((LOCKDOWN_E_SUCCESS != lockdownd_get_device_name(client, &device_name)) || !device_name) {
fprintf(stderr, "ERROR: Could not get device name!\n");
ret = -2;
}
@@ -104,11 +104,11 @@ int main(int argc, char **argv)
idevice_free(device);
if (ret == 0) {
- printf("%s\n", devname);
+ printf("%s\n", device_name);
}
- if (devname) {
- free(devname);
+ if (device_name) {
+ free(device_name);
}
return ret;