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

spicenum.c, cleanup dicoS usage

This commit is contained in:
rlar 2017-12-27 19:18:36 +01:00
parent aa0dbd20ad
commit 8022aa09a6
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontend/numparam/spicenum.c
View File

@ -486,10 +486,9 @@ dump_symbol_table(dico_t *dico, NGHASHPTR htable_p, FILE *fp)
void void
nupa_list_params(FILE *fp) nupa_list_params(FILE *fp)
{ {
dico_t *dico = dicoS; /* local copy for speed */
int depth; /* nested subcircit depth */ int depth; /* nested subcircit depth */
dico_t *dico; /* local copy for speed */
dico = dicoS;
if (dico == NULL) { if (dico == NULL) {
fprintf(cp_err, "\nWarning: No symbol table available for 'listing param'\n"); fprintf(cp_err, "\nWarning: No symbol table available for 'listing param'\n");
return; return;
@ -521,13 +520,12 @@ nupa_list_params(FILE *fp)
double double
nupa_get_param(char *param_name, int *found) nupa_get_param(char *param_name, int *found)
{ {
dico_t *dico = dicoS; /* local copy for speed */
int depth; /* nested subcircit depth */ int depth; /* nested subcircit depth */
char *up_name; /* current parameter upper case */ char *up_name; /* current parameter upper case */
entry_t *entry; /* current entry */ entry_t *entry; /* current entry */
dico_t *dico; /* local copy for speed */
double result = 0; /* parameter value */ double result = 0; /* parameter value */
dico = dicoS;
spice_dstring_reinit(& dico->lookup_buf); spice_dstring_reinit(& dico->lookup_buf);
scopy_up(& dico->lookup_buf, param_name); scopy_up(& dico->lookup_buf, param_name);
up_name = spice_dstring_value(& dico->lookup_buf); up_name = spice_dstring_value(& dico->lookup_buf);
@ -553,12 +551,11 @@ nupa_get_param(char *param_name, int *found)
void void
nupa_add_param(char *param_name, double value) nupa_add_param(char *param_name, double value)
{ {
dico_t *dico = dicoS; /* local copy for speed */
char *up_name; /* current parameter upper case */ char *up_name; /* current parameter upper case */
entry_t *entry; /* current entry */ entry_t *entry; /* current entry */
dico_t *dico; /* local copy for speed */
NGHASHPTR htable_p; /* hash table of interest */ NGHASHPTR htable_p; /* hash table of interest */
dico = dicoS;
/* ----------------------------------------------------------------- /* -----------------------------------------------------------------
* We use a dynamic string here because most of the time we will * We use a dynamic string here because most of the time we will
* be using short names and no memory allocation will occur. * be using short names and no memory allocation will occur.
@ -588,11 +585,10 @@ nupa_add_param(char *param_name, double value)
void void
nupa_add_inst_param(char *param_name, double value) nupa_add_inst_param(char *param_name, double value)
{ {
dico_t *dico = dicoS; /* local copy for speed */
char *up_name; /* current parameter upper case */ char *up_name; /* current parameter upper case */
entry_t *entry; /* current entry */ entry_t *entry; /* current entry */
dico_t *dico; /* local copy for speed */
dico = dicoS;
spice_dstring_reinit(& dico->lookup_buf); spice_dstring_reinit(& dico->lookup_buf);
scopy_up(& dico->lookup_buf, param_name); scopy_up(& dico->lookup_buf, param_name);
up_name = spice_dstring_value(& dico->lookup_buf); up_name = spice_dstring_value(& dico->lookup_buf);
@ -620,11 +616,10 @@ nupa_add_inst_param(char *param_name, double value)
void void
nupa_copy_inst_dico(void) nupa_copy_inst_dico(void)
{ {
dico_t *dico = dicoS; /* local copy for speed */
entry_t *entry; /* current entry */ entry_t *entry; /* current entry */
dico_t *dico; /* local copy for speed */
NGHASHITER iter; /* hash iterator - thread safe */ NGHASHITER iter; /* hash iterator - thread safe */
dico = dicoS;
if (dico->inst_symbols) { if (dico->inst_symbols) {
/* We we perform this operation we should be in global scope */ /* We we perform this operation we should be in global scope */
if (dico->stack_depth > 0) if (dico->stack_depth > 0)