diff --git a/ChangeLog b/ChangeLog index caf190c5b..b8a89922e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-08 Robert Larice + * src/tclspice.c , + * src/frontend/outitf.c , + * src/frontend/spiceif.c , + * src/spicelib/parser/ifnewuid.c : + INPtables, remove some casts, which are no longer necessary + 2010-07-08 Robert Larice * src/tclspice.c , * src/frontend/outitf.h , diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c index 9a13f52fb..3f831bea6 100644 --- a/src/frontend/outitf.c +++ b/src/frontend/outitf.c @@ -426,7 +426,7 @@ addSpecialDesc(runDesc *run, char *name, char *devname, char *param, int depind) unique = copy(devname); /* MW. My "special" routine here */ - INPinsertNofree(&unique, (INPtables *) ft_curckt->ci_symtab); + INPinsertNofree(&unique, ft_curckt->ci_symtab); data->specName = unique; data->specParamName = copy(param); diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index e72f43604..b0e4e67a7 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -161,7 +161,7 @@ if_inpdeck(struct line *deck, INPtables **tab) ft_curckt->ci_curTask = ft_curckt->ci_defTask; - INPpas1( ckt, (card *) deck->li_next,(INPtables *)*tab); + INPpas1( ckt, (card *) deck->li_next, *tab); INPpas2( ckt, (card *) deck->li_next, (INPtables *) *tab,ft_curckt->ci_defTask); INPkillMods(); @@ -617,7 +617,7 @@ spif_getparam_special(CKTcircuit *ckt,char **name,char *param,int ind,int do_mod if (!param || (param && eq(param, "all"))) { - INPretrieve(name,(INPtables *)ft_curckt->ci_symtab); + INPretrieve(name, ft_curckt->ci_symtab); typecode = finddev_special(ckt, *name, &dev, &mod, &modelo_dispositivo); if (typecode == -1) { @@ -709,7 +709,7 @@ spif_getparam_special(CKTcircuit *ckt,char **name,char *param,int ind,int do_mod } else if (param) { - INPretrieve(name,(INPtables *)ft_curckt->ci_symtab); + INPretrieve(name, ft_curckt->ci_symtab); typecode = finddev_special(ckt, *name, &dev, &mod, &modelo_dispositivo); if (typecode == -1) { @@ -754,7 +754,7 @@ spif_getparam(CKTcircuit *ckt, char **name, char *param, int ind, int do_model) if (param && eq(param, "all")) { /* MW. My "special routine here" */ - INPretrieve(name,(INPtables *)ft_curckt->ci_symtab); + INPretrieve(name, ft_curckt->ci_symtab); typecode = finddev(ckt, *name, &dev, &mod); if (typecode == -1) { @@ -785,7 +785,7 @@ spif_getparam(CKTcircuit *ckt, char **name, char *param, int ind, int do_model) } else if (param) { /* MW. */ - INPretrieve(name,(INPtables *)ft_curckt->ci_symtab); + INPretrieve(name, ft_curckt->ci_symtab); typecode = finddev(ckt, *name, &dev, &mod); if (typecode == -1) { fprintf(cp_err, @@ -822,7 +822,7 @@ if_setparam_model(CKTcircuit *ckt, char **name, char *val ) int typecode; /* retrieve device name from symbol table */ - INPretrieve(name,(INPtables *)ft_curckt->ci_symtab); + INPretrieve(name, ft_curckt->ci_symtab); /* find the specified device */ typecode = finddev(ckt, *name, &dev, &curMod); if (typecode == -1) { @@ -834,7 +834,7 @@ if_setparam_model(CKTcircuit *ckt, char **name, char *val ) retrieve the model from the global model table; also add the model to 'ckt' and indicate model is being used */ - INPgetMod( ckt, val, &inpmod, (INPtables *)ft_curckt->ci_symtab ); + INPgetMod( ckt, val, &inpmod, ft_curckt->ci_symtab ); if ( inpmod == NULL ) { fprintf(cp_err, "Error: no such model %s.\n", val); return; @@ -878,7 +878,7 @@ if_setparam_model(CKTcircuit *ckt, char **name, char *val ) if ( prevMod == NULL ) ckt->CKThead[typecode] = mods->GENnextModel; else prevMod->GENnextModel = mods->GENnextModel; - INPgetMod( ckt, (char *)mods->GENmodName, &inpmod, (INPtables *)ft_curckt->ci_symtab ); + INPgetMod( ckt, (char *)mods->GENmodName, &inpmod, ft_curckt->ci_symtab ); inpmod->INPmodUsed = 0; FREE(mods); @@ -899,7 +899,7 @@ if_setparam(CKTcircuit *ckt, char **name, char *param, struct dvec *val, int do_ int typecode; /* PN */ - INPretrieve(name,(INPtables *)ft_curckt->ci_symtab); + INPretrieve(name, ft_curckt->ci_symtab); typecode = finddev(ckt, *name, &dev, &mod); if (typecode == -1) { fprintf(cp_err, "Error: no such device or model name %s\n", *name); diff --git a/src/spicelib/parser/ifnewuid.c b/src/spicelib/parser/ifnewuid.c index 9179ea3d7..d7e5a24c1 100644 --- a/src/spicelib/parser/ifnewuid.c +++ b/src/spicelib/parser/ifnewuid.c @@ -55,7 +55,7 @@ IFnewUid(CKTcircuit *ckt, IFuid * newuid, IFuid olduid, char *suffix, int type, case UID_INSTANCE: case UID_OTHER: case UID_MODEL: - error = INPinsert(&newname, (INPtables *) ft_curckt->ci_symtab); + error = INPinsert(&newname, ft_curckt->ci_symtab); if (error && error != E_EXISTS) return (error); *newuid = (IFuid) newname; @@ -85,13 +85,13 @@ int IFdelUid(CKTcircuit *ckt, IFuid uid, int type) case UID_INSTANCE: case UID_OTHER: case UID_MODEL: - error = INPremove(uid, (INPtables *) ft_curckt->ci_symtab); + error = INPremove(uid, ft_curckt->ci_symtab); if (error && error != E_EXISTS) return (error); break; case UID_SIGNAL: - error = INPremTerm(uid, (INPtables *) ft_curckt->ci_symtab); + error = INPremTerm(uid, ft_curckt->ci_symtab); if (error && error != E_EXISTS) return (error); break; diff --git a/src/tclspice.c b/src/tclspice.c index b3484c56a..fd51a7fab 100755 --- a/src/tclspice.c +++ b/src/tclspice.c @@ -1233,7 +1233,7 @@ int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) { } /* get the unique IFuid for name (device/model) */ - INPretrieve(&name,(INPtables *)ft_curckt->ci_symtab); + INPretrieve(&name, ft_curckt->ci_symtab); err = (*(ft_sim->findInstance))(ft_curckt->ci_ckt,&typecode,&devptr,name,NULL,NULL); if (err != OK) { typecode = -1;