pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show either GUID or alias on Windows

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-03 17:33:04 +02:00
parent c2f583f0da
commit 95858bc3ba
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ethsock.c
View file

@ -444,7 +444,11 @@ int ethsock_list_all(void)
#ifndef NMRPFLASH_WINDOWS #ifndef NMRPFLASH_WINDOWS
printf("%s", dev->name); printf("%s", dev->name);
#else #else
printf(NMRPFLASH_ALIAS_PREFIX "%u", dev_num); if (!verbosity) {
printf("%s%u", NMRPFLASH_NETALIAS_PREFIX, dev_num);
} else {
printf("%s", dev->name);
}
#endif #endif
for (addr = dev->addresses; addr; addr = addr->next) { 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]); hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
#ifdef NMRPFLASH_WINDOWS #ifdef NMRPFLASH_WINDOWS
if (verbosity) {
printf(" %s", dev->name);
}
pretty = intf_get_pretty_name(dev->name); pretty = intf_get_pretty_name(dev->name);
if (pretty) { if (pretty) {
printf(" (%s)", pretty); printf(" (%s)", pretty);