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

change get_adapters_info to take adapter arg

This commit is contained in:
Doug MacEachern 2005-12-21 02:45:38 +00:00
parent 361af1a2cf
commit cd375c7337
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1725,7 +1725,8 @@ SIGAR_DECLARE(int) sigar_cpu_info_list_get(sigar_t *sigar,
#define sigar_GetAdaptersInfo \ #define sigar_GetAdaptersInfo \
sigar->iphlpapi.get_adapters_info.func sigar->iphlpapi.get_adapters_info.func
static int sigar_get_adapters_info(sigar_t *sigar) static int sigar_get_adapters_info(sigar_t *sigar,
PIP_ADAPTER_INFO *adapter)
{ {
ULONG size = sigar->ifconf_len; ULONG size = sigar->ifconf_len;
DWORD rc; DWORD rc;
@ -1736,8 +1737,8 @@ static int sigar_get_adapters_info(sigar_t *sigar)
return SIGAR_ENOTIMPL; return SIGAR_ENOTIMPL;
} }
rc = sigar_GetAdaptersInfo((PIP_ADAPTER_INFO)sigar->ifconf_buf, *adapter = (PIP_ADAPTER_INFO)sigar->ifconf_buf;
&size); rc = sigar_GetAdaptersInfo(*adapter, &size);
if (rc == ERROR_BUFFER_OVERFLOW) { if (rc == ERROR_BUFFER_OVERFLOW) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG, sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
@ -1748,8 +1749,8 @@ static int sigar_get_adapters_info(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_GetAdaptersInfo((PIP_ADAPTER_INFO)sigar->ifconf_buf, *adapter = (PIP_ADAPTER_INFO)sigar->ifconf_buf;
&size); rc = sigar_GetAdaptersInfo(*adapter, &size);
} }
if (rc != NO_ERROR) { if (rc != NO_ERROR) {
@ -1801,12 +1802,10 @@ SIGAR_DECLARE(int) sigar_net_info_get(sigar_t *sigar,
free(info); free(info);
if (sigar_get_adapters_info(sigar) != SIGAR_OK) { if (sigar_get_adapters_info(sigar, &adapter) != SIGAR_OK) {
return SIGAR_OK; return SIGAR_OK;
} }
adapter = (PIP_ADAPTER_INFO)sigar->ifconf_buf;
while (adapter) { while (adapter) {
/* should only be 1 */ /* should only be 1 */
if (adapter->GatewayList.IpAddress.String[0]) { if (adapter->GatewayList.IpAddress.String[0]) {