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

Fix multiple format strings on Windows

Browse source 
It's a miracle this didn't blow up earlier!
This commit is contained in:
Joseph C. Lehner 2021-05-31 19:17:40 +02:00
parent 483186efea
commit afeff8eb52
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ethsock.c
View file

@ -89,6 +89,7 @@ static int x_pcap_findalldevs(pcap_if_t **devs)
return 0;
}
#ifndef NMRPFLASH_WINDOWS
static int systemf(const char *fmt, ...)
{
char cmd[1024];
@ -106,6 +107,7 @@ static int systemf(const char *fmt, ...)
return ret;
}
#endif
#ifndef NMRPFLASH_WINDOWS
static inline bool sockaddr_get_hwaddr(struct sockaddr *sa, uint8_t *hwaddr)
@ -457,7 +459,7 @@ static const char *intf_name_to_wpcap(const char *intf)
NET_LUID luid;
GUID guid;
if (sscanf(intf, "net%d", &index) != 1) {
if (sscanf(intf, "net%lu", &index) != 1) {
index = if_nametoindex(intf);
if (!index) {
break;
@ -481,7 +483,7 @@ static const char *intf_name_to_wpcap(const char *intf)
}
snprintf(buf, sizeof(buf),
"\\Device\\NPF_{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
"\\Device\\NPF_{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
guid.Data1, guid.Data2, guid.Data3,
guid.Data4[0], guid.Data4[1], guid.Data4[2],
guid.Data4[3], guid.Data4[4], guid.Data4[5],
@ -510,7 +512,7 @@ NET_IFINDEX intf_get_index(const char* intf)
}
sscanf(p + 5,
"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X%n",
"%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%n",
&guid.Data1, &guid.Data2, &guid.Data3,
&guid.Data4[0], &guid.Data4[1], &guid.Data4[2],
&guid.Data4[3], &guid.Data4[4], &guid.Data4[5],
@ -910,7 +912,6 @@ int ethsock_list_all(void)
uint8_t hwaddr[6];
unsigned dev_num = 0, dev_ok = 0;
#ifdef NMRPFLASH_WINDOWS
char buf[IF_MAX_STRING_SIZE];
wchar_t *pretty = NULL;
NET_IFINDEX index;
MIB_IF_ROW2 row;
@ -957,7 +958,7 @@ int ethsock_list_all(void)
}
if (!verbosity && index) {
printf("net%-2d", index);
printf("net%-2lu", index);
} else {
printf("%-15s", dev->name);
}

2
nmrp.c
View file

@ -667,7 +667,7 @@ int nmrp_do(struct nmrpd_args *args)
}
if (bytes > 0) {
printf("OK (%zi b)\n", bytes);
printf("OK (%zd b)\n", bytes);
if (args->blind) {
goto out;

1
nmrpd.h
View file

@ -25,7 +25,6 @@
#if defined(_WIN32) || defined(_WIN64)
# define NMRPFLASH_WINDOWS
# define WIN32_LEAN_AND_MEAN
#elif defined(__APPLE__) && defined(__MACH__)
# define NMRPFLASH_UNIX
# define NMRPFLASH_OSX