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

fix the argument types of the functions printstr_n printstr_m bogus1 and bogus2

This commit is contained in:
rlar 2010-07-13 18:20:37 +00:00
parent 5397fd9fdd
commit 0772afc517
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2010-07-13 Robert Larice
* src/frontend/device.c ,
* src/frontend/device.h ,
* src/frontend/gens.c ,
* src/frontend/gens.h *
fix the argument types of the functions
printstr_n printstr_m bogus1 and bogus2
to fit the type signature expected by the iterator dgen_for_n()
2010-07-13 Robert Larice 2010-07-13 Robert Larice
* src/frontend/device.c , * src/frontend/device.c ,
* src/frontend/device.h : * src/frontend/device.h :

8
src/frontend/device.c
View File

@ -404,7 +404,7 @@ all_show_old(wordlist *wl, int mode)
} }
int int
printstr_n(dgen *dg) printstr_n(dgen *dg, IFparm *p, int i)
{ {
if (dg->instance) if (dg->instance)
fprintf(cp_out," %*.*s", DEV_WIDTH, DEV_WIDTH, dg->instance->GENname); fprintf(cp_out," %*.*s", DEV_WIDTH, DEV_WIDTH, dg->instance->GENname);
@ -414,7 +414,7 @@ printstr_n(dgen *dg)
} }
int int
printstr_m(dgen *dg) printstr_m(dgen *dg, IFparm *p, int i)
{ {
if (dg->model) if (dg->model)
fprintf(cp_out," %*.*s", DEV_WIDTH, DEV_WIDTH, dg->model->GENmodName); fprintf(cp_out," %*.*s", DEV_WIDTH, DEV_WIDTH, dg->model->GENmodName);
@ -568,13 +568,13 @@ listparam(wordlist *p, dgen *dg)
} }
} }
int bogus1(dgen *dg) int bogus1(dgen *dg, IFparm *p, int i)
{ {
fprintf(cp_out," %*s", DEV_WIDTH, "---------"); fprintf(cp_out," %*s", DEV_WIDTH, "---------");
return 0; return 0;
} }
int bogus2(dgen *dg) int bogus2(dgen *dg, IFparm *p, int i)
{ {
fprintf(cp_out," %*s", DEV_WIDTH, "?????????"); fprintf(cp_out," %*s", DEV_WIDTH, "?????????");
return 0; return 0;

8
src/frontend/device.h
View File

@ -12,13 +12,13 @@
void com_showmod(wordlist *wl); void com_showmod(wordlist *wl);
void com_show(wordlist *wl); void com_show(wordlist *wl);
int printstr_n(dgen *dg); int printstr_n(dgen *dg, IFparm *, int);
int printstr_m(dgen *dg); int printstr_m(dgen *dg, IFparm *, int);
void param_forall(dgen *dg, int flags); void param_forall(dgen *dg, int flags);
void param_forall_old(dgen *dg, int flags); void param_forall_old(dgen *dg, int flags);
void listparam(wordlist *p, dgen *dg); void listparam(wordlist *p, dgen *dg);
int bogus1(dgen *dg); int bogus1(dgen *dg, IFparm *, int);
int bogus2(dgen *dg); int bogus2(dgen *dg, IFparm *, int);
int printvals(dgen *dg, IFparm *p, int i); int printvals(dgen *dg, IFparm *p, int i);
int printvals_old(dgen *dg, IFparm *p, int i); int printvals_old(dgen *dg, IFparm *p, int i);
void old_show(wordlist *wl); void old_show(wordlist *wl);

2
src/frontend/gens.c
View File

@ -59,7 +59,7 @@ dgen_init(GENcircuit *ckt, wordlist *wl, int nomix, int flag, int model)
} }
int int
dgen_for_n(dgen *dg, int n, int (*fn) (/* ??? */), void *data, int subindex) dgen_for_n(dgen *dg, int n, int (*fn) (dgen*, IFparm*, int), IFparm *data, int subindex)
{ {
dgen dgx, *dgxp; dgen dgx, *dgxp;
int dnum, i, j, k; int dnum, i, j, k;

2
src/frontend/gens.h
View File

@ -10,7 +10,7 @@
void wl_forall(wordlist *wl, void (*fn)(wordlist*, dgen*), dgen *data); void wl_forall(wordlist *wl, void (*fn)(wordlist*, dgen*), dgen *data);
dgen * dgen_init(GENcircuit *ckt, wordlist *wl, int nomix, int flag, int model); dgen * dgen_init(GENcircuit *ckt, wordlist *wl, int nomix, int flag, int model);
int dgen_for_n(dgen *dg, int n, int (*fn) (/* ??? */), void *data, int subindex); int dgen_for_n(dgen *dg, int n, int (*fn) (dgen*, IFparm*, int), IFparm *data, int subindex);
void dgen_nth_next(dgen **dg, int n); void dgen_nth_next(dgen **dg, int n);