From 2dfecc2ffb06407e4577fe5224952f5a130cdcae Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Tue, 19 Mar 2013 10:47:02 +0100
Subject: idevice_id: Rename devname variable which shadows a global
 declaration on OS X

---
 tools/idevice_id.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tools')

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;
-- 
cgit v1.1-32-gdbae