diff --git a/ChangeLog b/ChangeLog index b373990c2..f0f6a76bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-06-23 Robert Larice + * src/frontend/evaluate.c , + * src/misc/hash.c , + * src/spicelib/devices/ltra/ltraset.c , + * src/xspice/evt/evtdump.c : + function pointer invocation, (*p)(...) ---> p(...) + 2011-06-23 Robert Larice * src/main.c : tiny fix, reoccuring option `h' in the getopt_long() option string diff --git a/src/frontend/evaluate.c b/src/frontend/evaluate.c index f7b812207..c304ecf73 100644 --- a/src/frontend/evaluate.c +++ b/src/frontend/evaluate.c @@ -59,7 +59,7 @@ ft_evaluate(struct pnode *node) d = apply_func(node->pn_func, node->pn_left); else if (node->pn_op) { if (node->pn_op->op_arity == 1) - d = ((*node->pn_op->op_func.unary) (node->pn_left)); + d = node->pn_op->op_func.unary (node->pn_left); else if (node->pn_op->op_arity == 2) { if(node->pn_op->op_num == PT_OP_TERNARY) d = ft_ternary(node); diff --git a/src/misc/hash.c b/src/misc/hash.c index 6ce269778..f05ac18d4 100644 --- a/src/misc/hash.c +++ b/src/misc/hash.c @@ -253,7 +253,7 @@ void * _nghash_find(NGHASHPTR hashtable, void * user_key,BOOL *status) NGHASH_NUM_TO_HASH( user_key, hsum, hashtable->size); break ; default: - hsum = (*((nghash_func)hashtable->hash_func))(hashtable,user_key) ; + hsum = ((nghash_func)hashtable->hash_func) (hashtable,user_key) ; } curPtr = table[hsum] ; @@ -371,7 +371,7 @@ void * nghash_delete(NGHASHPTR hashtable, void * user_key) NGHASH_NUM_TO_HASH( user_key, hsum, hashtable->size); break ; default: - hsum = (*((nghash_func)hashtable->hash_func))(hashtable,user_key) ; + hsum = ((nghash_func)hashtable->hash_func) (hashtable,user_key) ; } /* insert into table only if distinct number */ @@ -444,7 +444,7 @@ void * nghash_insert(NGHASHPTR hashtable, void * user_key, void * data) NGHASH_NUM_TO_HASH( user_key, hsum, hashtable->size); break ; default: - hsum = (*((nghash_func)hashtable->hash_func))(hashtable,user_key) ; + hsum = ((nghash_func)hashtable->hash_func) (hashtable,user_key) ; } /* insert into table only if distinct number */ @@ -536,7 +536,7 @@ static NGTABLEPTR _nghash_find_item(NGHASHPTR htable,void * user_key,void * data NGHASH_NUM_TO_HASH( user_key, hsum, htable->size); break ; default: - hsum = (*((nghash_func)htable->hash_func))(htable,user_key) ; + hsum = ((nghash_func)htable->hash_func) (htable,user_key) ; } /* insert into table only if distinct number */ @@ -773,7 +773,7 @@ BOOL nghash_deleteItem(NGHASHPTR hashtable, void * user_key, void * data) NGHASH_NUM_TO_HASH( user_key, hsum, hashtable->size); break ; default: - hsum = (*((nghash_func)hashtable->hash_func))(hashtable,user_key) ; + hsum = ((nghash_func)hashtable->hash_func) (hashtable,user_key) ; } /* insert into table only if distinct number */ diff --git a/src/spicelib/devices/ltra/ltraset.c b/src/spicelib/devices/ltra/ltraset.c index 84cbe5024..9d1f37ef5 100644 --- a/src/spicelib/devices/ltra/ltraset.c +++ b/src/spicelib/devices/ltra/ltraset.c @@ -57,7 +57,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (model->LTRAhowToInterp != LTRA_MOD_MIXEDINTERP)) { /* - * (*(SPfrontEnd->IFerror))(ERR_FATAL, "%s: have to specify one of + * SPfrontEnd->IFerror (ERR_FATAL, "%s: have to specify one of * lininterp, quadinterp or mixedinterp", &(model->LTRAmodName)); * return(E_BADPARM); */ @@ -78,7 +78,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) if (!model->LTRAconductGiven) { /* - * (*(SPfrontEnd->IFerror))(ERR_WARNING, "%s: lossy line parallel + * SPfrontEnd->IFerror (ERR_WARNING, "%s: lossy line parallel * conductance not given, assumed zero", &(model->LTRAmodName)); */ model->LTRAconduct = 0.0; diff --git a/src/xspice/evt/evtdump.c b/src/xspice/evt/evtdump.c index 88e4c581f..b63351671 100755 --- a/src/xspice/evt/evtdump.c +++ b/src/xspice/evt/evtdump.c @@ -261,7 +261,7 @@ void EVTdump( break; } /* Compare entry at end of list to rhsold */ - (*(g_evt_udn_info[node_table[i]->udn_index]->compare)) ( + g_evt_udn_info[node_table[i]->udn_index]->compare ( rhsold[i].node_value, here->node_value, &equal);