From 0772afc5170efcfcc430a66dc064918669a070f6 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 13 Jul 2010 18:20:37 +0000
Subject: [PATCH] fix the argument types of the functions printstr_n printstr_m
 bogus1 and bogus2

---
 ChangeLog             | 9 +++++++++
 src/frontend/device.c | 8 ++++----
 src/frontend/device.h | 8 ++++----
 src/frontend/gens.c   | 2 +-
 src/frontend/gens.h   | 2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28c5509e9..2fd3f5de4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  * src/frontend/device.c ,
  * src/frontend/device.h :
diff --git a/src/frontend/device.c b/src/frontend/device.c
index c73e2f39c..ffe42b52d 100644
--- a/src/frontend/device.c
+++ b/src/frontend/device.c
@@ -404,7 +404,7 @@ all_show_old(wordlist *wl, int mode)
 }
 
 int
-printstr_n(dgen *dg)
+printstr_n(dgen *dg, IFparm *p, int i)
 {
     if (dg->instance)
         fprintf(cp_out," %*.*s", DEV_WIDTH, DEV_WIDTH, dg->instance->GENname);
@@ -414,7 +414,7 @@ printstr_n(dgen *dg)
 }
 
 int
-printstr_m(dgen *dg)
+printstr_m(dgen *dg, IFparm *p, int i)
 {
     if (dg->model)
         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, "---------");
     return 0;
 }
 
-int bogus2(dgen *dg)
+int bogus2(dgen *dg, IFparm *p, int i)
 {
     fprintf(cp_out," %*s", DEV_WIDTH, "?????????");
     return 0;
diff --git a/src/frontend/device.h b/src/frontend/device.h
index 15d070444..dda9d3d88 100644
--- a/src/frontend/device.h
+++ b/src/frontend/device.h
@@ -12,13 +12,13 @@
 
 void com_showmod(wordlist *wl);
 void com_show(wordlist *wl);
-int printstr_n(dgen *dg);
-int printstr_m(dgen *dg);
+int printstr_n(dgen *dg, IFparm *, int);
+int printstr_m(dgen *dg, IFparm *, int);
 void  param_forall(dgen *dg, int flags);
 void  param_forall_old(dgen *dg, int flags);
 void  listparam(wordlist *p, dgen *dg);
-int bogus1(dgen *dg);
-int bogus2(dgen *dg);
+int bogus1(dgen *dg, IFparm *, int);
+int bogus2(dgen *dg, IFparm *, int);
 int printvals(dgen *dg, IFparm *p, int i);
 int printvals_old(dgen *dg, IFparm *p, int i);
 void old_show(wordlist *wl);
diff --git a/src/frontend/gens.c b/src/frontend/gens.c
index 90183f1a5..cba49baea 100644
--- a/src/frontend/gens.c
+++ b/src/frontend/gens.c
@@ -59,7 +59,7 @@ 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)
+dgen_for_n(dgen *dg, int n, int (*fn) (dgen*, IFparm*, int), IFparm *data, int subindex)
 {
 	dgen	dgx, *dgxp;
 	int	dnum, i, j, k;
diff --git a/src/frontend/gens.h b/src/frontend/gens.h
index 61767863c..1f53b2002 100644
--- a/src/frontend/gens.h
+++ b/src/frontend/gens.h
@@ -10,7 +10,7 @@
 
 void wl_forall(wordlist *wl, void (*fn)(wordlist*, dgen*), dgen *data);
 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);