bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change get_if_table to take iftable arg

This commit is contained in:
Doug MacEachern 2005-12-21 02:49:18 +00:00
parent cd375c7337
commit 70f18204dd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/os/win32/win32_sigar.c
View File

@ -1887,7 +1887,7 @@ SIGAR_DECLARE(int) sigar_net_route_list_get(sigar_t *sigar,
#define sigar_GetIfTable \ #define sigar_GetIfTable \
sigar->iphlpapi.get_if_table.func sigar->iphlpapi.get_if_table.func
static int sigar_get_if_table(sigar_t *sigar) static int sigar_get_if_table(sigar_t *sigar, PMIB_IFTABLE *iftable)
{ {
ULONG size = sigar->ifconf_len; ULONG size = sigar->ifconf_len;
DWORD rc; DWORD rc;
@ -1898,8 +1898,8 @@ static int sigar_get_if_table(sigar_t *sigar)
return SIGAR_ENOTIMPL; return SIGAR_ENOTIMPL;
} }
rc = sigar_GetIfTable((PMIB_IFTABLE)sigar->ifconf_buf, *iftable = (PMIB_IFTABLE)sigar->ifconf_buf;
&size, FALSE); rc = sigar_GetIfTable(*iftable, &size, FALSE);
if (rc == ERROR_INSUFFICIENT_BUFFER) { if (rc == ERROR_INSUFFICIENT_BUFFER) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG, sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
@ -1910,8 +1910,8 @@ static int sigar_get_if_table(sigar_t *sigar)
sigar->ifconf_buf = realloc(sigar->ifconf_buf, sigar->ifconf_buf = realloc(sigar->ifconf_buf,
sigar->ifconf_len); sigar->ifconf_len);
rc = sigar_GetIfTable((PMIB_IFTABLE)sigar->ifconf_buf, *iftable = (PMIB_IFTABLE)sigar->ifconf_buf;
&size, FALSE); rc = sigar_GetIfTable(*iftable, &size, FALSE);
} }
if (rc != NO_ERROR) { if (rc != NO_ERROR) {
@ -1936,12 +1936,10 @@ sigar_net_interface_stat_get(sigar_t *sigar, const char *name,
return status; return status;
} }
if ((status = sigar_get_if_table(sigar)) != SIGAR_OK) { if ((status = sigar_get_if_table(sigar, &ift)) != SIGAR_OK) {
return status; return status;
} }
ift = (MIB_IFTABLE *)sigar->ifconf_buf;
for (i=0; i<ift->dwNumEntries; i++) { for (i=0; i<ift->dwNumEntries; i++) {
ifr = ift->table + i; ifr = ift->table + i;