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

Be less verbose

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-06 19:49:58 +02:00
parent 5da29e5109
commit 5e37406b6d
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ethsock.c
View file

@ -94,7 +94,8 @@ void win_perror2(const char *msg, DWORD err)
(LPTSTR)&buf, 0, NULL); (LPTSTR)&buf, 0, NULL);
if (buf) { if (buf) {
fprintf(stderr, "%s: %s (%d)\n", msg, buf, (int)err); /* FormatMessageA terminates buf with CRLF! */
fprintf(stderr, "%s: %s", msg, buf);
LocalFree(buf); LocalFree(buf);
} else { } else {
fprintf(stderr, "%s: error %d\n", msg, (int)err); fprintf(stderr, "%s: error %d\n", msg, (int)err);
@ -210,7 +211,9 @@ static const char *intf_get_pretty_name(const char *intf)
"%s\\Connection", guid); "%s\\Connection", guid);
err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, buf, 0, KEY_READ, &hkey); err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, buf, 0, KEY_READ, &hkey);
if (err != ERROR_SUCCESS) { if (err != ERROR_SUCCESS) {
win_perror2("RegOpenKeyExA", err); if (verbosity > 1) {
win_perror2("RegOpenKeyExA", err);
}
return NULL; return NULL;
} }
@ -219,7 +222,9 @@ static const char *intf_get_pretty_name(const char *intf)
if (err == ERROR_SUCCESS) { if (err == ERROR_SUCCESS) {
intf = buf; intf = buf;
} else { } else {
win_perror2("RegQueryValueExA", err); if (verbosity > 1) {
win_perror2("RegQueryValueExA", err);
}
intf = NULL; intf = NULL;
} }
@ -460,6 +465,9 @@ int ethsock_list_all(void)
#ifndef NMRPFLASH_WINDOWS #ifndef NMRPFLASH_WINDOWS
printf("%s", dev->name); printf("%s", dev->name);
#else #else
/* Call this here so *_perror() calls don't happen within a line */
pretty = intf_get_pretty_name(dev->name);
if (!verbosity) { if (!verbosity) {
printf("%s%u", NMRPFLASH_NETALIAS_PREFIX, dev_num); printf("%s%u", NMRPFLASH_NETALIAS_PREFIX, dev_num);
} else { } else {
@ -483,7 +491,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
pretty = intf_get_pretty_name(dev->name);
if (pretty) { if (pretty) {
printf(" (%s)", pretty); printf(" (%s)", pretty);
} else if (dev->description) { } else if (dev->description) {