luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix type and usage of some function pointers

This commit is contained in:
rlar 2010-07-11 18:10:08 +00:00
parent a19f5dc9ac
commit 460f7a6485
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-07-11 Robert Larice
* src/spicelib/analysis/cktsens.c :
fix type and usage of some function pointers
2010-07-11 Robert Larice 2010-07-11 Robert Larice
* src/spicelib/devices/dev.c : * src/spicelib/devices/dev.c :
fix some function pointer casts fix some function pointer casts

5
src/spicelib/analysis/cktsens.c
View File

@ -719,12 +719,12 @@ sens_temp(sgen *sg, CKTcircuit *ckt)
int int
sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val) sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
{ {
int (*fn)( );
int pid; int pid;
error = 0; error = 0;
if (sg->is_instparam) { if (sg->is_instparam) {
int (*fn) (CKTcircuit*, GENinstance*, int, IFvalue*, IFvalue*);
fn = DEVices[sg->dev]->DEVask; fn = DEVices[sg->dev]->DEVask;
pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id; pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id;
if (fn) if (fn)
@ -732,10 +732,11 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
else else
return 1; return 1;
} else { } else {
int (*fn) (CKTcircuit*, GENmodel*, int, IFvalue*);
fn = DEVices[sg->dev]->DEVmodAsk; fn = DEVices[sg->dev]->DEVmodAsk;
pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id; pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id;
if (fn) if (fn)
error = (*fn)(ckt, sg->model, pid, val, NULL); error = (*fn)(ckt, sg->model, pid, val);
else else
return 1; return 1;
} }