From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Wed, 3 Feb 2016 15:33:04 +0000 (+0200)
Subject: Show either GUID or alias on Windows
X-Git-Tag: v0.9~55
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=95858bc3badd916b973ac71df4050f21414b671c;p=oweals%2Fnmrpflash.git

Show either GUID or alias on Windows
---

diff --git a/ethsock.c b/ethsock.c
index b85b79e..72c2940 100644
--- a/ethsock.c
+++ b/ethsock.c
@@ -444,7 +444,11 @@ int ethsock_list_all(void)
 #ifndef NMRPFLASH_WINDOWS
 		printf("%s", dev->name);
 #else
-		printf(NMRPFLASH_ALIAS_PREFIX "%u", dev_num);
+		if (!verbosity) {
+			printf("%s%u", NMRPFLASH_NETALIAS_PREFIX, dev_num);
+		} else {
+			printf("%s", dev->name);
+		}
 #endif
 
 		for (addr = dev->addresses; addr; addr = addr->next) {
@@ -463,10 +467,6 @@ int ethsock_list_all(void)
 				hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
 
 #ifdef NMRPFLASH_WINDOWS
-		if (verbosity) {
-			printf("  %s", dev->name);
-		}
-
 		pretty = intf_get_pretty_name(dev->name);
 		if (pretty) {
 			printf("  (%s)", pretty);