From 460f7a6485d186cf39eaed064ce1d555af76eea3 Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 11 Jul 2010 18:10:08 +0000 Subject: [PATCH] fix type and usage of some function pointers --- ChangeLog | 4 ++++ src/spicelib/analysis/cktsens.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3af8c9365..a7b0a3394 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * src/spicelib/devices/dev.c : fix some function pointer casts diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index b48c2a9a0..23528a46f 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -719,12 +719,12 @@ sens_temp(sgen *sg, CKTcircuit *ckt) int sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val) { - int (*fn)( ); int pid; error = 0; if (sg->is_instparam) { + int (*fn) (CKTcircuit*, GENinstance*, int, IFvalue*, IFvalue*); fn = DEVices[sg->dev]->DEVask; pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id; if (fn) @@ -732,10 +732,11 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val) else return 1; } else { + int (*fn) (CKTcircuit*, GENmodel*, int, IFvalue*); fn = DEVices[sg->dev]->DEVmodAsk; pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id; if (fn) - error = (*fn)(ckt, sg->model, pid, val, NULL); + error = (*fn)(ckt, sg->model, pid, val); else return 1; }