K&R ext2sim/*.c: bulk function implementation conversion

K&R obsolete syntax removal for C23 compatibility series

ext2sim/ext2sim.c

@@ -200,8 +200,8 @@ extern devMerge *devMergeList;
  */
 
 int
-Exttosim_Init(interp)
+Exttosim_Init(
-    Tcl_Interp *interp;
+    Tcl_Interp *interp)
 {
     /* Sanity checks! */
     if (interp == NULL) return TCL_ERROR;
@@ -249,9 +249,9 @@ Exttosim_Init(interp)
 #define EXTTOSIM_HELP		9
 
 void
-CmdExtToSim(w, cmd)
+CmdExtToSim(
-    MagWindow *w;
+    MagWindow *w,
-    TxCommand *cmd;
+    TxCommand *cmd)
 {
     int i,flatFlags;
     char *inName;
@@ -717,9 +717,9 @@ runexttosim:
  */
 
 int
-main(argc, argv)
+main(
-    int argc;
+    int argc,
-    char *argv[];
+    char *argv[])
 {
 
     int i,flatFlags;
@@ -859,9 +859,9 @@ main(argc, argv)
  */
 
 int
-simParseArgs(pargc, pargv)
+simParseArgs(
-    int *pargc;
+    int *pargc,
-    char ***pargv;
+    char ***pargv)
 {
     char **argv = *pargv, *cp;
     int argc = *pargc;
@@ -967,9 +967,9 @@ usage:
  * ----------------------------------------------------------------------------
  */
 EFNode *
-SimGetNode(prefix, suffix)
+SimGetNode(
-HierName *prefix;
+    HierName *prefix,
-HierName *suffix;
+    HierName *suffix)
 {
 	HashEntry *he;
 
@@ -1009,11 +1009,11 @@ HierName *suffix;
  */
 
 int
-simdevVisit(dev, hc, scale, trans)
+simdevVisit(
-    Dev *dev;		/* Device being output */
+    Dev *dev,		/* Device being output */
-    HierContext *hc;	/* Hierarchical context down to this device */
+    HierContext *hc,	/* Hierarchical context down to this device */
-    float scale;	/* Scale transform for output */
+    float scale,	/* Scale transform for output */
-    Transform *trans;	/* Coordinate transform */
+    Transform *trans)	/* Coordinate transform */
 {
     DevTerm *gate, *source, *drain, *term;
     EFNode  *subnode, *snode, *dnode;
@@ -1319,13 +1319,13 @@ simdevVisit(dev, hc, scale, trans)
 }
 
 int
-simdevSubstrate( prefix, suffix, type, scale, doAP, outf)
+simdevSubstrate(
-HierName *prefix;
+    HierName *prefix,
-HierName *suffix;
+    HierName *suffix,
-int type;
+    int type,
-float scale;
+    float scale,
-bool doAP;
+    bool doAP,
-FILE *outf;
+    FILE *outf)
 {
     HashEntry *he;
     EFNodeName *nn;
@@ -1389,11 +1389,12 @@ FILE *outf;
  * ----------------------------------------------------------------------------
  */
 
-bool simnAP(node, resClass, scale, outf)
+bool
-EFNode *node;
+simnAP(
-int  resClass;
+    EFNode *node,
-float scale;
+    int resClass,
-FILE *outf;
+    float scale,
+    FILE *outf)
 {
 	int a, p;
 
@@ -1413,12 +1414,13 @@ FILE *outf;
 	return TRUE;
 }
 
-bool simnAPHier(dterm, hierName, resClass, scale, outf)
+bool
-    DevTerm *dterm;
+simnAPHier(
-    HierName *hierName;
+    DevTerm *dterm,
-    int  resClass;
+    HierName *hierName,
-    float scale;
+    int resClass,
-    FILE *outf;
+    float scale,
+    FILE *outf)
 {
 	EFNode *node = dterm->dterm_node;
 	nodeClientHier   *nc ;
@@ -1467,11 +1469,11 @@ bool simnAPHier(dterm, hierName, resClass, scale, outf)
  */
 
 int
-simdevOutNode(prefix, suffix, name, outf)
+simdevOutNode(
-    HierName *prefix;
+    HierName *prefix,
-    HierName *suffix;
+    HierName *suffix,
-    char *name;
+    char *name,
-    FILE *outf;
+    FILE *outf)
 {
     HashEntry *he;
     EFNodeName *nn;
@@ -1517,10 +1519,11 @@ simdevOutNode(prefix, suffix, name, outf)
  * ----------------------------------------------------------------------------
  */
 
-int simcapVisit(hierName1, hierName2, cap)
+int
-    HierName *hierName1;
+simcapVisit(
-    HierName *hierName2;
+    HierName *hierName1,
-    double cap;
+    HierName *hierName2,
+    double cap)
 {
     cap = cap / 1000;
     if (cap <= EFCapThreshold)
@@ -1561,10 +1564,10 @@ int simcapVisit(hierName1, hierName2, cap)
  */
 
 int
-simresistVisit(hierName1, hierName2, res)
+simresistVisit(
-    HierName *hierName1;
+    HierName *hierName1,
-    HierName *hierName2;
+    HierName *hierName2,
-    float res;
+    float res)
 {
     fprintf(esSimF, "r ");
     EFHNOut(hierName1, esSimF);
@@ -1592,10 +1595,11 @@ simresistVisit(hierName1, hierName2, res)
  * ----------------------------------------------------------------------------
  */
 
-int simnodeVisit(node, res, cap)
+int
-    EFNode *node;
+simnodeVisit(
-    int res;
+    EFNode *node,
-    double cap;
+    int res,
+    double cap)
 {
     EFNodeName *nn;
     HierName *hierName;
@@ -1687,13 +1691,18 @@ int simnodeVisit(node, res, cap)
  *
  * ----------------------------------------------------------------------------
  */
-devMerge *simmkDevMerge(l, w, g, s, d, b, hn, dev)
+devMerge *
-int   l, w;
+simmkDevMerge(
-EFNode *g, *s, *d, *b;
+    int l,
-HierName *hn;
+    int w,
-Dev    *dev;
+    EFNode *g,
+    EFNode *s,
+    EFNode *d,
+    EFNode *b,
+    HierName *hn,
+    Dev *dev)
 {
-	   devMerge *fp;
+	devMerge *fp;
 
 	fp = (devMerge *) mallocMagic((unsigned) (sizeof(devMerge)));
 	fp->l = l; fp->w = w;
@@ -1754,11 +1763,11 @@ Dev    *dev;
  * ----------------------------------------------------------------------------
  */
 int
-simmergeVisit(dev, hc, scale, trans)
+simmergeVisit(
-Dev *dev;		/* Dev to examine */
+    Dev *dev,		/* Dev to examine */
-HierContext *hc;	/* Hierarchical context down to this dev */
+    HierContext *hc,	/* Hierarchical context down to this dev */
-float scale;		/* Scale transform */
+    float scale,	/* Scale transform */
-Transform *trans;	/* Coordinate transform (not used) */
+    Transform *trans)	/* Coordinate transform (not used) */
 {
 	DevTerm *gate, *source, *drain;
 	Dev     *cf;

ext2sim/finds.c

@@ -4,8 +4,8 @@
 #include <ctype.h>
 
 char *
-token(pnext)
+token(
-    char **pnext;
+    char **pnext)
 {
     char *cp, *ep;
 
@@ -25,9 +25,11 @@ token(pnext)
  * Match the last len characters of cp against name.
  * Returns 1 on success, 0 on failure.
  */
-endmatch(name, len, cp)
+int
-    char *name, *cp;
+endmatch(
-    int len;
+    char *name,
+    int len,
+    char *cp)
 {
     char *ep;
 
@@ -44,9 +46,9 @@ endmatch(name, len, cp)
     return (0);
 }
 
-main(argc, argv)
+main(
-    int argc;
+    int argc,
-    char *argv[];
+    char *argv[])
 {
     char line[1024], *name, *cp, *next;
     HashTable ht;
@@ -76,22 +78,22 @@ main(argc, argv)
 }
 
 char *
-TxGetLine(line, len)
+TxGetLine(
-    char *line;
+    char *line,
-    int len;
+    int len)
 {
     return (fgets(line, len, stdin));
 }
 
-TxError(s, a)
+TxError(
-    char *s;
+    char *s)
 {
     vfprintf(stdout, s, &a);
     fflush(stdout);
 }
 
-MainExit(code)
+MainExit(
-    int code;
+    int code)
 {
     exit(code);
 }

ext2sim/sim2simp.c

@@ -21,8 +21,9 @@ MOS	mosFets[NSIZE];
 int	par = 0, ndx = 0;
 
 
-char *strsave(s)
+char *
-char *s;
+strsave(
+    char *s)
 {
 	char *p ;
 
@@ -31,9 +32,11 @@ char *s;
 	return p;
 }
 
-void parseAttr(str, a, p)
+void
-char *str;
+parseAttr(
-int *a, *p;
+    char *str,
+    int *a,
+    int *p)
 {
 	int l;
 	char *s;
@@ -51,8 +54,19 @@ int *a, *p;
 			fprintf(stderr,"Weird attributes output will be incorect\n");
 }
 
-void addMos( typ, g, s, d, l, w, x, y, ga, sa, da)
+void
-char *typ, *g, *s, *d, *l, *w, *x, *y, *ga, *sa, *da;
+addMos(
+    char *typ,
+    char *g,
+    char *s,
+    char *d,
+    char *l,
+    char *w,
+    char *x,
+    char *y,
+    char *ga,
+    char *sa,
+    char *da)
 {
 	int i ;
 	MOS *iptr;