diff --git a/ChangeLog b/ChangeLog index b6908e540..15d5267e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-11 Robert Larice + * src/spicelib/devices/cktinit.c , + * src/spicelib/parser/inp2b.c : + cleanup + 2010-08-10 Robert Larice * src/frontend/spiceif.c , * src/spicelib/analysis/acan.c , diff --git a/src/spicelib/devices/cktinit.c b/src/spicelib/devices/cktinit.c index 3c223fbb9..0d4da4db5 100644 --- a/src/spicelib/devices/cktinit.c +++ b/src/spicelib/devices/cktinit.c @@ -24,9 +24,8 @@ int CKTinit(CKTcircuit **ckt) /* new circuit to create */ { int i; - CKTcircuit *sckt; - *ckt = (CKTcircuit *) tmalloc(sizeof(CKTcircuit)); - sckt = (CKTcircuit * /*fixme*/)(*ckt); + CKTcircuit *sckt = (CKTcircuit *) tmalloc(sizeof(CKTcircuit)); + *ckt = sckt; if (sckt == NULL) return(E_NOMEM); /* gtri - begin - dynamically allocate the array of model lists */ diff --git a/src/spicelib/parser/inp2b.c b/src/spicelib/parser/inp2b.c index 29a63439a..3fae48b2d 100644 --- a/src/spicelib/parser/inp2b.c +++ b/src/spicelib/parser/inp2b.c @@ -30,8 +30,6 @@ void INP2B(CKTcircuit *ckt, INPtables * tab, card * current) double leadval; /* actual value of unlabeled number */ IFuid uid; /* uid for default model name */ - CKTcircuit* inckt = (CKTcircuit*) ckt; /* get circuit struct for hertz-flag */ - /* Arbitrary source. */ type = INPtypelook("ASRC"); if (type < 0) { @@ -41,7 +39,7 @@ void INP2B(CKTcircuit *ckt, INPtables * tab, card * current) /* if we find 'hertz' variable, set flag to actual circuit */ if(strstr(current->line, "hertz")) - inckt->CKTvarHertz = 1; + ckt->CKTvarHertz = 1; line = current->line; INPgetTok(&line, &name, 1);