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

remove malloc casts

This commit is contained in:
Doug MacEachern 2004-06-22 23:44:46 +00:00
parent f51b9f1cbb
commit 903fabc3e4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ static PERF_OBJECT_TYPE *get_perf_object(sigar_t *sigar, char *counter_key,
*err = SIGAR_OK; *err = SIGAR_OK;
if (!sigar->perfbuf) { if (!sigar->perfbuf) {
sigar->perfbuf = (char *)malloc(PERFBUF_SIZE); sigar->perfbuf = malloc(PERFBUF_SIZE);
sigar->perfbuf_size = PERFBUF_SIZE; sigar->perfbuf_size = PERFBUF_SIZE;
} }
@ -92,8 +92,8 @@ static PERF_OBJECT_TYPE *get_perf_object(sigar_t *sigar, char *counter_key,
if (retval == ERROR_MORE_DATA) { if (retval == ERROR_MORE_DATA) {
sigar->perfbuf_size += PERFBUF_SIZE; sigar->perfbuf_size += PERFBUF_SIZE;
sigar->perfbuf = (char *)realloc(sigar->perfbuf, sigar->perfbuf =
sigar->perfbuf_size); realloc(sigar->perfbuf, sigar->perfbuf_size);
} }
else { else {
*err = retval; *err = retval;
@ -1727,8 +1727,7 @@ sigar_net_interface_list_get(sigar_t *sigar,
iflist->number = 0; iflist->number = 0;
iflist->size = num; iflist->size = num;
iflist->data = iflist->data =
(char **)malloc(sizeof(*(iflist->data)) * malloc(sizeof(*(iflist->data)) * iflist->size);
iflist->size);
for (i=0; i<num ; i++) { for (i=0; i<num ; i++) {
INTERFACE_INFO *if_info = ((INTERFACE_INFO *)buffer) + i; INTERFACE_INFO *if_info = ((INTERFACE_INFO *)buffer) + i;
@ -1774,7 +1773,7 @@ static int net_conn_get_tcp(sigar_t *sigar,
if (rc != ERROR_INSUFFICIENT_BUFFER) { if (rc != ERROR_INSUFFICIENT_BUFFER) {
return GetLastError(); return GetLastError();
} }
tcp = (PMIB_TCPTABLE)malloc(size); tcp = malloc(size);
rc = sigar->get_tcp_table(tcp, &size, FALSE); rc = sigar->get_tcp_table(tcp, &size, FALSE);
if (rc) { if (rc) {
free(tcp); free(tcp);
@ -1831,7 +1830,7 @@ static int net_conn_get_udp(sigar_t *sigar,
if (rc != ERROR_INSUFFICIENT_BUFFER) { if (rc != ERROR_INSUFFICIENT_BUFFER) {
return GetLastError(); return GetLastError();
} }
udp = (PMIB_UDPTABLE)malloc(size); udp = malloc(size);
rc = sigar->get_udp_table(udp, &size, FALSE); rc = sigar->get_udp_table(udp, &size, FALSE);
if (rc) { if (rc) {
free(udp); free(udp);