resis: convert K&R function definitions to ANSI C

Convert the old-style (K&R) function definitions in resis/ to ANSI C
prototypes, formatted in the project's convention: the return type on its
own line and each parameter on its own line, indented four spaces, with
the original parameter comments retained.

Builds cleanly under GCC 16 / C23 (with the -std=gnu17 build change).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Andreas Wendleder 2026-06-10 03:49:16 +02:00
parent 60f3fec41c
commit 7c4194e259
No known key found for this signature in database
GPG Key ID: 588785BFDFB01ABD
14 changed files with 374 additions and 368 deletions

View File

@ -44,9 +44,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/
void
resMakePortBreakpoints(tile, list)
Tile *tile;
resNode **list;
resMakePortBreakpoints(
Tile *tile,
resNode **list)
{
int x, y;
resNode *resptr;
@ -95,10 +95,10 @@ resMakePortBreakpoints(tile, list)
*/
void
ResStartTile(tile, x, y)
Tile *tile;
int x, y;
ResStartTile(
Tile *tile,
int x,
int y)
{
resNode *resptr;
@ -135,9 +135,9 @@ ResStartTile(tile, x, y)
#define IGNORE_BOTTOM 8
bool
ResEachTile(tile, devNodeTable)
Tile *tile; /* Tile being processed */
HashTable *devNodeTable; /* Table of tiles connected to devices */
ResEachTile(
Tile *tile, /* Tile being processed */
HashTable *devNodeTable) /* Table of tiles connected to devices */
{
Tile *tp;
resNode *resptr;

View File

@ -43,12 +43,11 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/
void
ResSanityChecks(nodename, resistorList, nodeList, devlist)
char *nodename;
resResistor *resistorList;
resNode *nodeList;
resDevice *devlist;
ResSanityChecks(
char *nodename,
resResistor *resistorList,
resNode *nodeList,
resDevice *devlist)
{
resResistor *resistor;
resNode *node;

View File

@ -46,9 +46,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/
void
ResPrintNodeList(fp, list)
FILE *fp;
resNode *list;
ResPrintNodeList(
FILE *fp,
resNode *list)
{
for (; list != NULL; list = list->rn_more)
@ -72,10 +72,9 @@ ResPrintNodeList(fp, list)
*-------------------------------------------------------------------------
*/
void
ResPrintResistorList(fp, list)
FILE *fp;
resResistor *list;
ResPrintResistorList(
FILE *fp,
resResistor *list)
{
for (; list != NULL; list = list->rr_nextResistor)
{
@ -111,10 +110,9 @@ ResPrintResistorList(fp, list)
*/
void
ResPrintDeviceList(fp, list)
FILE *fp;
resDevice *list;
ResPrintDeviceList(
FILE *fp,
resDevice *list)
{
static char termtype[] = {'g','s','d','c'};
int i;

View File

@ -61,9 +61,9 @@ extern void ResCheckConcavity();
*/
int
ResFracture(plane, rect)
Plane *plane;
Rect *rect;
ResFracture(
Plane *plane,
Rect *rect)
{
Point start;
Tile *tpnew;
@ -161,10 +161,10 @@ enumerate:
*/
void
ResCheckConcavity(bot, top, tt)
Tile *bot, *top;
TileType tt;
ResCheckConcavity(
Tile *bot,
Tile *top,
TileType tt)
{
Tile *tp;
int xlen, ylen;
@ -271,12 +271,12 @@ ResCheckConcavity(bot, top, tt)
*/
int
resWalkup(tile, tt, xpos, ypos, func)
Tile *tile;
TileType tt;
int xpos, ypos;
Tile * (*func)();
resWalkup(
Tile *tile,
TileType tt,
int xpos,
int ypos,
Tile * (*func)())
{
Point pt;
Tile *tp;
@ -304,12 +304,12 @@ resWalkup(tile, tt, xpos, ypos, func)
}
int
resWalkdown(tile, tt, xpos, ypos, func)
Tile *tile;
TileType tt;
int xpos, ypos;
Tile * (*func)();
resWalkdown(
Tile *tile,
TileType tt,
int xpos,
int ypos,
Tile * (*func)())
{
Point pt;
Tile *tp;
@ -345,12 +345,12 @@ resWalkdown(tile, tt, xpos, ypos, func)
}
int
resWalkright(tile, tt, xpos, ypos, func)
Tile *tile;
TileType tt;
int xpos, ypos;
Tile * (*func)();
resWalkright(
Tile *tile,
TileType tt,
int xpos,
int ypos,
Tile * (*func)())
{
Point pt;
Tile *tp;
@ -378,12 +378,12 @@ resWalkright(tile, tt, xpos, ypos, func)
}
int
resWalkleft(tile, tt, xpos, ypos, func)
Tile *tile;
TileType tt;
int xpos, ypos;
Tile * (*func)();
resWalkleft(
Tile *tile,
TileType tt,
int xpos,
int ypos,
Tile * (*func)())
{
Point pt;
Tile *tp;
@ -433,10 +433,9 @@ resWalkleft(tile, tt, xpos, ypos, func)
*/
Tile *
ResSplitX(tile, x)
Tile *tile;
int x;
ResSplitX(
Tile *tile,
int x)
{
Tile *delayed = NULL; /* delayed free to extend lifetime */
TileType tt = TiGetType(tile);

View File

@ -48,12 +48,14 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/
void
ResNewTermDevice(tile, tp, n, xj, yj, direction, PendingList)
Tile *tile, *tp;
int n; /* Terminal index */
int xj, yj; /* Location of connection */
int direction; /* Direction of current */
resNode **PendingList;
ResNewTermDevice(
Tile *tile,
Tile *tp,
int n, /* Terminal index */
int xj,
int yj,
int direction, /* Direction of current */
resNode **PendingList)
{
resNode *resptr = NULL;
resDevice *resDev;
@ -132,10 +134,13 @@ ResNewTermDevice(tile, tp, n, xj, yj, direction, PendingList)
*/
void
ResNewSubDevice(tile, tp, xj, yj, direction, PendingList)
Tile *tile, *tp;
int xj, yj, direction;
resNode **PendingList;
ResNewSubDevice(
Tile *tile,
Tile *tp,
int xj,
int yj,
int direction,
resNode **PendingList)
{
resNode *resptr;
resDevice *resDev;
@ -185,10 +190,12 @@ ResNewSubDevice(tile, tp, xj, yj, direction, PendingList)
*/
void
ResProcessJunction(tile, tp, xj, yj, NodeList)
Tile *tile, *tp;
int xj, yj;
resNode **NodeList;
ResProcessJunction(
Tile *tile,
Tile *tp,
int xj,
int yj,
resNode **NodeList)
{
ResJunction *junction;
resNode *resptr;

View File

@ -144,8 +144,8 @@ ResGetReCell()
*------------------------------------------------------------------------
*/
void
ResDissolveContacts(contacts)
ResContactPoint *contacts;
ResDissolveContacts(
ResContactPoint *contacts)
{
TileType t, conttype;
Tile *tp;
@ -226,8 +226,8 @@ typedef struct driversinkdata {
*/
void
ResMakeDriverSinkPorts(def)
CellDef *def;
ResMakeDriverSinkPorts(
CellDef *def)
{
Plane *plane;
Rect *rect;
@ -359,10 +359,10 @@ ResMakeDriverSinkPorts(def)
*/
int
ResAddPortFunc(tile, dinfo, dsd)
Tile *tile;
TileType dinfo; /* (unused) */
DriverSinkData *dsd; /* Data for driver or sink */
ResAddPortFunc(
Tile *tile,
TileType dinfo, /* (unused) */
DriverSinkData *dsd) /* Data for driver or sink */
{
resPort *rp;
resInfo *pX;
@ -432,9 +432,9 @@ typedef struct reslabeldata {
*/
void
ResMakeLabelPorts(def, resisdata)
CellDef *def;
ResisData *resisdata;
ResMakeLabelPorts(
CellDef *def,
ResisData *resisdata)
{
Plane *plane;
TileTypeBitMask mask;
@ -526,10 +526,10 @@ ResMakeLabelPorts(def, resisdata)
*/
int
ResAddLabelFunc(tile, dinfo, rld)
Tile *tile;
TileType dinfo; /* (unused) */
ResLabelData *rld; /* Label and node data */
ResAddLabelFunc(
Tile *tile,
TileType dinfo, /* (unused) */
ResLabelData *rld) /* Label and node data */
{
resPort *rp;
resInfo *pX;
@ -586,8 +586,8 @@ ResAddLabelFunc(tile, dinfo, rld)
*/
void
ResFindNewContactTiles(contacts)
ResContactPoint *contacts;
ResFindNewContactTiles(
ResContactPoint *contacts)
{
int pNum;
Tile *tile;
@ -697,10 +697,10 @@ ResFindNewContactTiles(contacts)
*/
int
ResProcessTiles(resisdata, origin, devNodeTable)
ResisData *resisdata;
Point *origin;
HashTable *devNodeTable;
ResProcessTiles(
ResisData *resisdata,
Point *origin,
HashTable *devNodeTable)
{
Tile *startTile;
int tilenum, merged;
@ -841,9 +841,9 @@ ResProcessTiles(resisdata, origin, devNodeTable)
*/
void
ResCalcPerimOverlap(tile, dev)
Tile *tile;
ResDevTile *dev;
ResCalcPerimOverlap(
Tile *tile,
ResDevTile *dev)
{
Tile *tp;
int t1;
@ -902,10 +902,10 @@ ResCalcPerimOverlap(tile, dev)
*/
int
resMakeDevFunc(tile, dinfo, cx)
Tile *tile;
TileType dinfo;
TreeContext *cx;
resMakeDevFunc(
Tile *tile,
TileType dinfo,
TreeContext *cx)
{
ResDevTile *thisDev = (ResDevTile *)cx->tc_filter->tf_arg;
Rect devArea;
@ -971,10 +971,10 @@ resMakeDevFunc(tile, dinfo, cx)
#define IGNORE_BOTTOM 8
int
resExpandDevFunc(tile, dinfo, cx)
Tile *tile;
TileType dinfo; /* Split tile information (unused) */
TreeContext *cx;
resExpandDevFunc(
Tile *tile,
TileType dinfo, /* Split tile information (unused) */
TreeContext *cx)
{
ResDevTile *thisDev = (ResDevTile *)cx->tc_filter->tf_arg;
static Stack *devExtentsStack = NULL;
@ -1132,10 +1132,10 @@ resExpandDevFunc(tile, dinfo, cx)
*/
int
ResShaveContacts(tile, dinfo, def)
Tile *tile;
TileType dinfo; /* (unused, see comment below) */
CellDef *def;
ResShaveContacts(
Tile *tile,
TileType dinfo, /* (unused, see comment below) */
CellDef *def)
{
TileType ttype;
TileTypeBitMask *rmask;
@ -1194,10 +1194,10 @@ ResShaveContacts(tile, dinfo, def)
*/
bool
ResExtractNet(node, resisdata, cellname)
ResExtNode *node;
ResisData *resisdata;
char *cellname;
ResExtractNet(
ResExtNode *node,
ResisData *resisdata,
char *cellname)
{
SearchContext scx;
TileTypeBitMask FirstTileMask;
@ -1595,10 +1595,10 @@ ResCleanUpEverything()
*/
int
ResGetTileFunc(tile, dinfo, tpptr)
Tile *tile;
TileType dinfo; /* (unused) */
Tile **tpptr;
ResGetTileFunc(
Tile *tile,
TileType dinfo, /* (unused) */
Tile **tpptr)
{
/* To simplify processing, if a split tile does not have TT_SPACE
* on either side, then only the left side is processed.
@ -1641,9 +1641,9 @@ ResGetTileFunc(tile, dinfo, tpptr)
*/
Tile *
FindStartTile(resisdata, SourcePoint)
ResisData *resisdata;
Point *SourcePoint;
FindStartTile(
ResisData *resisdata,
Point *SourcePoint)
{
Point workingPoint;
Tile *tile, *tp;
@ -2054,9 +2054,9 @@ FindStartTile(resisdata, SourcePoint)
*/
resDevice *
ResGetDevice(pt, type)
Point *pt;
TileType type;
ResGetDevice(
Point *pt,
TileType type)
{
Point workingPoint;
Tile *tile;

View File

@ -52,11 +52,11 @@ bool ResCalcEastWest();
*/
bool
ResCalcTileResistance(tile, info, pendingList, doneList)
Tile *tile;
resInfo *info;
resNode **pendingList, **doneList;
ResCalcTileResistance(
Tile *tile,
resInfo *info,
resNode **pendingList,
resNode **doneList)
{
int MaxX = MINFINITY, MinX = INFINITY;
int MaxY = MINFINITY, MinY = INFINITY;
@ -119,10 +119,11 @@ ResCalcTileResistance(tile, info, pendingList, doneList)
*/
bool
ResCalcEastWest(tile, pendingList, doneList, resList)
Tile *tile;
resNode **pendingList, **doneList;
resResistor **resList;
ResCalcEastWest(
Tile *tile,
resNode **pendingList,
resNode **doneList,
resResistor **resList)
{
int count, height;
bool merged;
@ -331,10 +332,11 @@ ResCalcEastWest(tile, pendingList, doneList, resList)
*/
bool
ResCalcNorthSouth(tile, pendingList, doneList, resList)
Tile *tile;
resNode **pendingList, **doneList;
resResistor **resList;
ResCalcNorthSouth(
Tile *tile,
resNode **pendingList,
resNode **doneList,
resResistor **resList)
{
int count, width;
bool merged;
@ -544,11 +546,11 @@ ResCalcNorthSouth(tile, pendingList, doneList, resList)
*/
bool
ResCalcNearDevice(tile, pendingList, doneList, resList)
Tile *tile;
resNode **pendingList, **doneList;
resResistor **resList;
ResCalcNearDevice(
Tile *tile,
resNode **pendingList,
resNode **doneList,
resResistor **resList)
{
bool merged;
int devcount, devedge, deltax, deltay;
@ -853,10 +855,10 @@ ResCalcNearDevice(tile, pendingList, doneList, resList)
*/
void
ResDoContacts(contact, nodes, resList)
ResContactPoint *contact;
resNode **nodes;
resResistor **resList;
ResDoContacts(
ResContactPoint *contact,
resNode **nodes,
resResistor **resList)
{
resNode *resptr;
cElement *ccell;
@ -1136,7 +1138,9 @@ SplitList(
*/
Breakpoint *
MergeSortBreaks(Breakpoint *list, int xsort)
MergeSortBreaks(
Breakpoint *list,
int xsort)
{
Breakpoint *a, *b;
@ -1172,9 +1176,9 @@ MergeSortBreaks(Breakpoint *list, int xsort)
*/
int
ResSortBreaks(masterlist, xsort)
Breakpoint **masterlist;
int xsort;
ResSortBreaks(
Breakpoint **masterlist,
int xsort)
{
Breakpoint *p1, *p2, *p3, *p4;
bool changed;

View File

@ -42,9 +42,8 @@ extern void ResFixBreakPoint();
*/
void
ResDoneWithNode(resptr)
resNode *resptr;
ResDoneWithNode(
resNode *resptr)
{
int status;
resNode *resptr2;
@ -136,10 +135,12 @@ ResDoneWithNode(resptr)
*/
void
ResFixRes(resptr, resptr2, resptr3, elimResis, newResis)
resNode *resptr, *resptr2, *resptr3;
resResistor *elimResis, *newResis;
ResFixRes(
resNode *resptr,
resNode *resptr2,
resNode *resptr3,
resResistor *elimResis,
resResistor *newResis)
{
resElement *thisREl;
@ -182,9 +183,9 @@ ResFixRes(resptr, resptr2, resptr3, elimResis, newResis)
*/
void
ResFixParallel(elimResis, newResis)
resResistor *elimResis, *newResis;
ResFixParallel(
resResistor *elimResis,
resResistor *newResis)
{
if ((newResis->rr_value + elimResis->rr_value) != 0)
{
@ -218,9 +219,8 @@ ResFixParallel(elimResis, newResis)
*/
int
ResSeriesCheck(resptr)
resNode *resptr;
ResSeriesCheck(
resNode *resptr)
{
resResistor *rr1,*rr2;
resNode *resptr2, *resptr3;
@ -403,8 +403,8 @@ ResSeriesCheck(resptr)
*/
int
ResParallelCheck(resptr)
resNode *resptr;
ResParallelCheck(
resNode *resptr)
{
resResistor *r1, *r2;
resNode *resptr2, *resptr3;
@ -521,9 +521,8 @@ ResParallelCheck(resptr)
*/
int
ResTriangleCheck(resptr)
resNode *resptr;
ResTriangleCheck(
resNode *resptr)
{
resResistor *rr1, *rr2, *rr3;
int status = UNTOUCHED;
@ -849,9 +848,11 @@ ResTriangleCheck(resptr)
*/
void
ResMergeNodes(node1, node2, pendingList, doneList)
resNode *node1, *node2;
resNode **pendingList, **doneList;
ResMergeNodes(
resNode *node1,
resNode *node2,
resNode **pendingList,
resNode **doneList)
{
resElement *workingRes, *tRes;
tElement *workingDev, *tDev;
@ -1021,10 +1022,9 @@ ResMergeNodes(node1, node2, pendingList, doneList)
*/
void
ResDeleteResPointer(node, resistor)
resNode *node;
resResistor *resistor;
ResDeleteResPointer(
resNode *node,
resResistor *resistor)
{
resElement *rcell1, *rcell2;
int notfound = TRUE;
@ -1071,9 +1071,9 @@ ResDeleteResPointer(node, resistor)
*/
void
ResEliminateResistor(resistor, homelist)
resResistor *resistor, **homelist;
ResEliminateResistor(
resResistor *resistor,
resResistor **homelist)
{
if (resistor->rr_lastResistor == NULL)
*homelist = resistor->rr_nextResistor;
@ -1108,11 +1108,11 @@ ResEliminateResistor(resistor, homelist)
*/
void
ResCleanNode(resptr, info, homelist1, homelist2)
resNode *resptr;
int info;
resNode **homelist1;
resNode **homelist2;
ResCleanNode(
resNode *resptr,
int info,
resNode **homelist1,
resNode **homelist2)
{
resElement *rcell;
cElement *ccell;
@ -1193,10 +1193,10 @@ ResCleanNode(resptr, info, homelist1, homelist2)
*/
void
ResFixBreakPoint(sourcelist, origNode, newNode)
Breakpoint **sourcelist;
resNode *origNode, *newNode;
ResFixBreakPoint(
Breakpoint **sourcelist,
resNode *origNode,
resNode *newNode)
{
Breakpoint *bp, *bp2, *bp3, *bp4;
int alreadypresent;

View File

@ -46,11 +46,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/
void
ResPrintExtRes(outextfile, resistors, nodename)
FILE *outextfile;
resResistor *resistors;
char *nodename;
ResPrintExtRes(
FILE *outextfile,
resResistor *resistors,
char *nodename)
{
int nodenum = 0;
char newname[MAXNAME];
@ -106,9 +105,9 @@ ResPrintExtRes(outextfile, resistors, nodename)
*/
void
ResPrintExtDev(outextfile, devices)
FILE *outextfile;
RDev *devices;
ResPrintExtDev(
FILE *outextfile,
RDev *devices)
{
char *subsName;
ExtDevice *devptr, *devtest;
@ -210,10 +209,10 @@ ResPrintExtDev(outextfile, devices)
*/
void
ResPrintExtNode(outextfile, nodelist, node)
FILE *outextfile;
resNode *nodelist;
ResExtNode *node;
ResPrintExtNode(
FILE *outextfile,
resNode *nodelist,
ResExtNode *node)
{
char *nodename = node->name;
int nodenum = 0;
@ -321,9 +320,9 @@ ResPrintExtNode(outextfile, nodelist, node)
*/
void
ResPrintStats(resisdata, name)
ResisData *resisdata;
char *name;
ResPrintStats(
ResisData *resisdata,
char *name)
{
static int totalnets = 0, totalnodes = 0, totalresistors = 0;
int nodes, resistors;
@ -367,9 +366,9 @@ ResPrintStats(resisdata, name)
*/
void
resWriteNodeName(fp, nodeptr)
FILE *fp;
resNode *nodeptr;
resWriteNodeName(
FILE *fp,
resNode *nodeptr)
{
if (nodeptr->rn_name == NULL)
fprintf(fp, "N%d", nodeptr->rn_id);
@ -387,12 +386,12 @@ resWriteNodeName(fp, nodeptr)
*/
void
ResPrintFHNodes(fp, nodelist, nodename, nidx, celldef)
FILE *fp;
resNode *nodelist;
char *nodename;
int *nidx;
CellDef *celldef;
ResPrintFHNodes(
FILE *fp,
resNode *nodelist,
char *nodename,
int *nidx,
CellDef *celldef)
{
char newname[16];
resNode *nodeptr;
@ -575,11 +574,11 @@ ResPrintFHNodes(fp, nodelist, nodename, nidx, celldef)
*/
void
ResPrintFHRects(fp, reslist, nodename, eidx)
FILE *fp;
resResistor *reslist;
char *nodename;
int *eidx; /* element (segment) index */
ResPrintFHRects(
FILE *fp,
resResistor *reslist,
char *nodename,
int *eidx) /* element (segment) index */
{
resResistor *resistors;
float oscale, thick, cwidth;
@ -677,10 +676,10 @@ ResPrintFHRects(fp, reslist, nodename, eidx)
*/
void
ResPrintReference(fp, devices, cellDef)
FILE *fp;
RDev *devices;
CellDef *cellDef;
ResPrintReference(
FILE *fp,
RDev *devices,
CellDef *cellDef)
{
char *outfile = cellDef->cd_name;
Rect *bbox = &(cellDef->cd_bbox);
@ -735,10 +734,10 @@ ResPrintReference(fp, devices, cellDef)
*/
int
ResCreateCenterlines(reslist, nidx, def)
resResistor *reslist;
int *nidx;
CellDef *def;
ResCreateCenterlines(
resResistor *reslist,
int *nidx,
CellDef *def)
{
resResistor *resistors;
resNode *nodeptr;

View File

@ -127,7 +127,8 @@ ResFixPoint *ResFixList;
*/
int
ResReadExt(CellDef *def)
ResReadExt(
CellDef *def)
{
char *line = NULL, *argv[128];
int result, locresult;
@ -518,7 +519,9 @@ ResReadParentExt(CellDef *parent,
*/
ResExtNode *
ResReadNode(int argc, char *argv[])
ResReadNode(
int argc,
char *argv[])
{
HashEntry *entry;
ResExtNode *node;
@ -1052,8 +1055,8 @@ ResReadAttribute(ResExtNode *node,
*/
ResExtNode *
ResExtInitNode(entry)
HashEntry *entry;
ResExtInitNode(
HashEntry *entry)
{
ResExtNode *node;

View File

@ -83,9 +83,9 @@ int ResPortIndex; /* Port ordering to backannotate into magic */
*/
void
ExtResisForDef(celldef, resisdata)
CellDef *celldef;
ResisData *resisdata;
ExtResisForDef(
CellDef *celldef,
ResisData *resisdata)
{
RDev *oldRDev;
HashSearch hs;
@ -263,9 +263,9 @@ ResInit()
*/
void
CmdExtResis(win, cmd)
MagWindow *win;
TxCommand *cmd;
CmdExtResis(
MagWindow *win,
TxCommand *cmd)
{
int i, j, k, option, value, saveFlags;
@ -802,9 +802,9 @@ typedef enum {
*/
int
resSubcircuitFunc(cellUse, rdata)
CellUse *cellUse;
ResisData *rdata;
resSubcircuitFunc(
CellUse *cellUse,
ResisData *rdata)
{
CellDef *cellDef = cellUse->cu_def;
Plane *savePlane;
@ -843,11 +843,11 @@ resSubcircuitFunc(cellUse, rdata)
*/
int
resPortFunc(scx, lab, tpath, result)
SearchContext *scx;
Label *lab;
TerminalPath *tpath;
int *result;
resPortFunc(
SearchContext *scx,
Label *lab,
TerminalPath *tpath,
int *result)
{
Rect r;
int pclass, puse;
@ -946,8 +946,8 @@ resPortFunc(scx, lab, tpath, result)
*/
int
ResCheckBlackbox(cellDef)
CellDef *cellDef;
ResCheckBlackbox(
CellDef *cellDef)
{
int result = 1;
SearchContext scx;
@ -990,8 +990,8 @@ ResCheckBlackbox(cellDef)
*/
int
ResCheckPorts(cellDef)
CellDef *cellDef;
ResCheckPorts(
CellDef *cellDef)
{
Label *lab;
HashEntry *entry;
@ -1313,9 +1313,9 @@ ResProcessNode(
*/
void
ResCheckExtNodes(celldef, resisdata)
CellDef *celldef;
ResisData *resisdata;
ResCheckExtNodes(
CellDef *celldef,
ResisData *resisdata)
{
ResExtNode *node;
int numext = 0; /* Number of nets extracted */
@ -1506,11 +1506,11 @@ ResFixUpSinkpoints(ResConnect *sink,
*/
void
ResFixUpConnections(extDev, layoutDev, extNode, nodename)
RDev *extDev;
resDevice *layoutDev;
ResExtNode *extNode;
char *nodename;
ResFixUpConnections(
RDev *extDev,
resDevice *layoutDev,
ResExtNode *extNode,
char *nodename)
{
static char newname[MAXNAME], oldnodename[MAXNAME];
int notdecremented;
@ -1810,12 +1810,11 @@ ResFixUpConnections(extDev, layoutDev, extNode, nodename)
*/
void
ResFixDevName(line, type, device, layoutnode)
char line[];
int type;
RDev *device;
resNode *layoutnode;
ResFixDevName(
char line[],
int type,
RDev *device,
resNode *layoutnode)
{
HashEntry *entry;
ResExtNode *node;
@ -1881,8 +1880,9 @@ ResFixDevName(line, type, device, layoutnode)
*/
int
devSortFunc(rec1, rec2)
devPtr **rec1, **rec2;
devSortFunc(
devPtr **rec1,
devPtr **rec2)
{
devPtr *dev1 = *rec1;
devPtr *dev2 = *rec2;
@ -1932,8 +1932,8 @@ devSortFunc(rec1, rec2)
*/
void
ResSortByGate(DevpointerList)
devPtr **DevpointerList;
ResSortByGate(
devPtr **DevpointerList)
{
devPtr *working, **Devindexed;
int listlen, listidx;
@ -1950,7 +1950,8 @@ ResSortByGate(DevpointerList)
for (working = *DevpointerList; working; working = working->nextDev)
Devindexed[listidx++] = working;
qsort(Devindexed, (size_t)listlen, (size_t)sizeof(devPtr *), devSortFunc);
qsort(Devindexed, (size_t)listlen, (size_t)sizeof(devPtr *),
(int (*)(const void *, const void *))devSortFunc);
for (listidx = 0; listidx < listlen - 1; listidx++)
Devindexed[listidx]->nextDev = Devindexed[listidx + 1];
@ -1973,9 +1974,9 @@ ResSortByGate(DevpointerList)
*/
void
ResWriteLumpFile(node, resisdata)
ResExtNode *node;
ResisData *resisdata;
ResWriteLumpFile(
ResExtNode *node,
ResisData *resisdata)
{
int lumpedres;
@ -2009,9 +2010,9 @@ ResWriteLumpFile(node, resisdata)
*/
void
ResAlignNodes(nodelist, reslist)
resNode *nodelist;
resResistor *reslist;
ResAlignNodes(
resNode *nodelist,
resResistor *reslist)
{
resResistor *resistor;
resNode *node1;
@ -2068,11 +2069,12 @@ ResAlignNodes(nodelist, reslist)
*/
int
ResWriteExtFile(celldef, node, resisdata, nidx, eidx)
CellDef *celldef;
ResExtNode *node;
ResisData *resisdata;
int *nidx, *eidx;
ResWriteExtFile(
CellDef *celldef,
ResExtNode *node,
ResisData *resisdata,
int *nidx,
int *eidx)
{
char *cp, newname[MAXNAME];
devPtr *ptr;

View File

@ -63,11 +63,11 @@ extern void ResAddResistorToList();
*/
void
ResSimplifyNet(nodelist, biglist, reslist, tolerance)
resNode **nodelist, **biglist;
resResistor **reslist;
float tolerance;
ResSimplifyNet(
resNode **nodelist,
resNode **biglist,
resResistor **reslist,
float tolerance)
{
resElement *resisptr;
resNode *node, *otherNode, *node1, *node2;
@ -372,9 +372,9 @@ ResSimplifyNet(nodelist, biglist, reslist, tolerance)
*/
void
ResMoveDevices(node1, node2)
resNode *node1, *node2;
ResMoveDevices(
resNode *node1,
resNode *node2)
{
tElement *devptr, *oldptr;
resDevice *device;
@ -413,7 +413,9 @@ ResMoveDevices(node1, node2)
*/
int
qrescompare(const void *one, const void *two)
qrescompare(
const void *one,
const void *two)
{
int cval;
@ -442,11 +444,11 @@ qrescompare(const void *one, const void *two)
*/
void
ResScrunchNet(reslist, pendingList, biglist, tolerance)
resResistor **reslist;
resNode **pendingList, **biglist;
float tolerance;
ResScrunchNet(
resResistor **reslist,
resNode **pendingList,
resNode **biglist,
float tolerance)
{
resResistor *current, *working;
resNode *node1, *node2;
@ -640,9 +642,9 @@ ResScrunchNet(reslist, pendingList, biglist, tolerance)
*/
void
ResAddResistorToList(resistor, locallist)
resResistor *resistor, **locallist;
ResAddResistorToList(
resResistor *resistor,
resResistor **locallist)
{
resResistor *local, *last = NULL;
@ -696,10 +698,9 @@ ResAddResistorToList(resistor, locallist)
*/
void
ResDistributeCapacitance(nodelist, totalcap)
resNode *nodelist;
float totalcap;
ResDistributeCapacitance(
resNode *nodelist,
float totalcap)
{
float totalarea = 0, capperarea;
resNode *workingNode;
@ -739,9 +740,8 @@ ResDistributeCapacitance(nodelist, totalcap)
*/
float
ResCalculateChildCapacitance(me)
resNode *me;
ResCalculateChildCapacitance(
resNode *me)
{
RCDelayStuff *myC;
resElement *workingRes;
@ -817,11 +817,10 @@ ResCalculateChildCapacitance(me)
*/
void
ResCalculateTDi(node, resistor, resistorvalue)
resNode *node;
resResistor *resistor;
int resistorvalue;
ResCalculateTDi(
resNode *node,
resResistor *resistor,
int resistorvalue)
{
resElement *workingRes;
RCDelayStuff *rcd = (RCDelayStuff *)node->rn_client;
@ -863,11 +862,12 @@ ResCalculateTDi(node, resistor, resistorvalue)
*/
void
ResPruneTree(node, minTdi, nodelist1, nodelist2, resistorlist)
resNode *node, **nodelist1, **nodelist2;
float minTdi;
resResistor **resistorlist;
ResPruneTree(
resNode *node,
float minTdi,
resNode **nodelist1,
resNode **nodelist2,
resResistor **resistorlist)
{
resResistor *currentRes;
resElement *current;
@ -920,9 +920,8 @@ ResPruneTree(node, minTdi, nodelist1, nodelist2, resistorlist)
*/
int
ResDoSimplify(resisdata)
ResisData *resisdata;
ResDoSimplify(
ResisData *resisdata)
{
resNode *node, *slownode;
float bigres = 0.0;
@ -1061,7 +1060,8 @@ ResDoSimplify(resisdata)
*/
void
ResSetPathRes(ResisData *resisdata)
ResSetPathRes(
ResisData *resisdata)
{
HeapEntry he;
resNode *node;
@ -1119,9 +1119,8 @@ ResSetPathRes(ResisData *resisdata)
*/
void
resPathNode(node)
resNode *node;
resPathNode(
resNode *node)
{
resElement *re;
@ -1158,9 +1157,8 @@ resPathNode(node)
*/
void
resPathRes(res)
resResistor *res;
resPathRes(
resResistor *res)
{
resNode *node0, *node1;
int flag0, flag1;

View File

@ -45,10 +45,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/
ExtRegion *
ResFirst(tile, dinfo, arg)
Tile *tile;
TileType dinfo;
FindRegion *arg;
ResFirst(
Tile *tile,
TileType dinfo,
FindRegion *arg)
{
ResContactPoint *reg;
TileType t;
@ -151,11 +151,11 @@ resSubstrateTerm(
*/
int
ResEach(tile, dinfo, pNum, arg)
Tile *tile;
TileType dinfo;
int pNum;
FindRegion *arg;
ResEach(
Tile *tile,
TileType dinfo,
int pNum,
FindRegion *arg)
{
if (((ResContactPoint *)(arg->fra_region))->cp_contactTile != tile)
@ -818,11 +818,10 @@ ResAddDevPlumbing(
*/
int
ResRemovePlumbing(tile, dinfo, arg)
Tile *tile;
TileType dinfo; // Unused, but should be handled.
ClientData *arg;
ResRemovePlumbing(
Tile *tile,
TileType dinfo, // Unused, but should be handled.
ClientData *arg)
{
ClientData ticlient = TiGetClient(tile);
if (ticlient != CLIENTDEFAULT)
@ -848,8 +847,8 @@ ResRemovePlumbing(tile, dinfo, arg)
*/
void
ResFreeDevTiles(TileList)
ResDevTile *TileList;
ResFreeDevTiles(
ResDevTile *TileList)
{
ResDevTile *oldTile;
@ -884,11 +883,11 @@ ResFreeDevTiles(TileList)
*/
void
ResPreProcessDevices(TileList, DeviceList, Def, devNodeTable)
ResDevTile *TileList;
resDevice *DeviceList;
CellDef *Def;
HashTable *devNodeTable;
ResPreProcessDevices(
ResDevTile *TileList,
resDevice *DeviceList,
CellDef *Def,
HashTable *devNodeTable)
{
Tile *tile;
ResDevTile *oldTile;
@ -1072,8 +1071,9 @@ ResPreProcessDevices(TileList, DeviceList, Def, devNodeTable)
*/
void
ResAddToQueue(node, list)
resNode *node, **list;
ResAddToQueue(
resNode *node,
resNode **list)
{
node->rn_more = *list;
node->rn_less = NULL;
@ -1095,8 +1095,9 @@ ResAddToQueue(node, list)
*/
void
ResRemoveFromQueue(node, list)
resNode *node, **list;
ResRemoveFromQueue(
resNode *node,
resNode **list)
{
if (node->rn_less != NULL)
{
@ -1122,8 +1123,8 @@ ResRemoveFromQueue(node, list)
}
resInfo *
resAddField(tile)
Tile *tile;
resAddField(
Tile *tile)
{
ClientData ticlient = TiGetClient(tile);
resInfo *Info = (resInfo *)CD2PTR(ticlient);

View File

@ -42,10 +42,9 @@ static char sccsid[] = "@(#)Write.c 4.10 MAGIC (Stanford Addition) 07/86";
#define RESGROUPSIZE 256
void
ResPrintNetwork(filename, reslist)
char *filename;
resResistor *reslist;
ResPrintNetwork(
char *filename,
resResistor *reslist)
{
char bigname[255], name1[255], name2[255];
FILE *fp;
@ -95,11 +94,10 @@ ResPrintNetwork(filename, reslist)
}
void
ResPrintCurrents(filename, extension, node)
char *filename;
float extension;
resNode *node;
ResPrintCurrents(
char *filename,
float extension,
resNode *node)
{
char bigname[255];
FILE *fp;
@ -128,11 +126,10 @@ ResPrintCurrents(filename, extension, node)
*/
void
resCurrentPrintFunc(node, resistor, filename)
resNode *node;
resResistor *resistor;
FILE *filename;
resCurrentPrintFunc(
resNode *node,
resResistor *resistor,
FILE *filename)
{
tElement *workingDev;
float i_sum = 0.0;
@ -174,11 +171,10 @@ ResDeviceCounts()
void
ResWriteECLFile(filename, reslist, nodelist)
char *filename;
resResistor *reslist;
resNode *nodelist;
ResWriteECLFile(
char *filename,
resResistor *reslist,
resNode *nodelist)
{
char newname[100], *tmpname, *per;
FILE *fp;