diff --git a/ChangeLog b/ChangeLog index 47e5a720d..813e9ff50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-07-01 Robert Larice + * src/frontend/inpcom.c, + * src/spicelib/devices/cktinit.c : + fix some typecasts to *malloc() return values + 2010-07-01 Robert Larice * src/frontend/inpcom.c : explicit compare with NULL diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 39b5f6945..6f1fd469c 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -1123,7 +1123,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c break; } else if(ipc_status == IPC_STATUS_OK) { - buffer = (void *) tmalloc(strlen(ipc_buffer) + 3); + buffer = (char *) tmalloc(strlen(ipc_buffer) + 3); strcpy(buffer, ipc_buffer); strcat(buffer, "\n"); } diff --git a/src/spicelib/devices/cktinit.c b/src/spicelib/devices/cktinit.c index 02504bc81..d97b13b7f 100644 --- a/src/spicelib/devices/cktinit.c +++ b/src/spicelib/devices/cktinit.c @@ -87,7 +87,7 @@ CKTinit(void **ckt) /* new circuit to create */ /* gtri - begin - wbk - allocate/initialize substructs */ /* Allocate evt data structure */ - (sckt)->evt = (void *) MALLOC(sizeof(Evt_Ckt_Data_t)); + (sckt)->evt = (Evt_Ckt_Data_t *) MALLOC(sizeof(Evt_Ckt_Data_t)); if(! (sckt)->evt) return(E_NOMEM); @@ -95,7 +95,7 @@ CKTinit(void **ckt) /* new circuit to create */ (sckt)->evt->options.op_alternate = MIF_TRUE; /* Allocate enh data structure */ - (sckt)->enh = (void *) MALLOC(sizeof(Enh_Ckt_Data_t)); + (sckt)->enh = (Enh_Ckt_Data_t *) MALLOC(sizeof(Enh_Ckt_Data_t)); if(! (sckt)->enh) return(E_NOMEM);