luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mzrouter: convert K&R function definitions to ANSI C 

Convert the old-style (K&R) function definitions in mzrouter/ 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:15 +02:00
parent e826c6c82f
commit 5f0f184f04
No known key found for this signature in database
GPG Key ID: 588785BFDFB01ABD
14 changed files with 321 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
mzrouter/mzBlock.c
View File

@ -145,8 +145,8 @@ extern void mzPaintBlockType();
*/
void
mzBuildMaskDataBlocks(buildArea)
Rect *buildArea; /* Area over which blockage planes will be built */
mzBuildMaskDataBlocks(
Rect *buildArea) /* Area over which blockage planes will be built */
{
Rect searchArea;
int pNum;
@ -234,10 +234,10 @@ mzBuildMaskDataBlocks(buildArea)
*/
int
mzBuildBlockFunc(tile, dinfo, cxp)
Tile *tile;
TileType dinfo; // Unused
TreeContext *cxp;
mzBuildBlockFunc(
Tile *tile,
TileType dinfo, // Unused
TreeContext *cxp)
{
SearchContext *scx = cxp->tc_scx;
Rect *buildArea = (Rect *) (cxp->tc_filter->tf_arg);
@ -274,9 +274,9 @@ mzBuildBlockFunc(tile, dinfo, cxp)
*/
int
mzBlockSubcellsFunc(scx, cdarg)
SearchContext *scx;
ClientData cdarg;
mzBlockSubcellsFunc(
SearchContext *scx,
ClientData cdarg)
{
Rect r, rDest;
Rect *buildArea = (Rect *) cdarg;
@ -317,7 +317,10 @@ mzBlockSubcellsFunc(scx, cdarg)
*/
int
mzPaintSameNodeFunc(Tile *t, TileType dinfo, Rect *buildArea)
mzPaintSameNodeFunc(
Tile *t,
TileType dinfo,
Rect *buildArea)
{
Rect r;
TileType ttype;
@ -351,11 +354,11 @@ mzPaintSameNodeFunc(Tile *t, TileType dinfo, Rect *buildArea)
*/
void
mzPaintBlockType(r, type, buildArea, blockType)
Rect *r;
TileType type;
Rect *buildArea;
TileType blockType;
mzPaintBlockType(
Rect *r,
TileType type,
Rect *buildArea,
TileType blockType)
{
RouteType *rT;
TileType locBlockType;
@ -522,8 +525,8 @@ mzPaintBlockType(r, type, buildArea, blockType)
*/
void
mzBuildFenceBlocks(buildArea)
Rect *buildArea; /* Area over which planes modified */
mzBuildFenceBlocks(
Rect *buildArea) /* Area over which planes modified */
{
int mzBuildFenceBlocksFunc();
Rect searchArea;
@ -580,10 +583,10 @@ mzBuildFenceBlocks(buildArea)
*/
int
mzBuildFenceBlocksFunc(tile, dinfo, buildArea)
Tile *tile;
TileType dinfo;
Rect *buildArea; /* clip to this area before painting */
mzBuildFenceBlocksFunc(
Tile *tile,
TileType dinfo,
Rect *buildArea) /* clip to this area before painting */
{
RouteType *rT;
int d;
@ -648,8 +651,8 @@ mzBuildFenceBlocksFunc(tile, dinfo, buildArea)
*/
void
mzExtendBlockBoundsR(rect)
Rect *rect;
mzExtendBlockBoundsR(
Rect *rect)
{
Rect area;
TileTypeBitMask genMask;
@ -724,10 +727,10 @@ mzExtendBlockBoundsR(rect)
*/
int
mzExtendBlockFunc(tile, dinfo, cdarg)
Tile *tile;
TileType dinfo;
ClientData cdarg;
mzExtendBlockFunc(
Tile *tile,
TileType dinfo,
ClientData cdarg)
{
Rect area;
@ -785,8 +788,8 @@ mzExtendBlockFunc(tile, dinfo, cdarg)
*/
void
mzExtendBlockBounds(point)
Point *point;
mzExtendBlockBounds(
Point *point)
{
Rect rect;
@ -934,10 +937,10 @@ mzBuildDestAreaBlocks()
*/
int
mzDestAreaFunc(tile, dinfo, cxp)
Tile *tile;
TileType dinfo; /* (unused) */
TreeContext *cxp;
mzDestAreaFunc(
Tile *tile,
TileType dinfo, /* (unused) */
TreeContext *cxp)
{
SearchContext *scx = cxp->tc_scx;
TileType type = TiGetType(tile);
@ -1014,10 +1017,10 @@ mzDestAreaFunc(tile, dinfo, cxp)
*/
int
mzDestWalksFunc(tile, dinfo, cxp)
Tile *tile;
TileType dinfo; /* (unused) */
TreeContext *cxp;
mzDestWalksFunc(
Tile *tile,
TileType dinfo, /* (unused) */
TreeContext *cxp)
{
SearchContext *scx = cxp->tc_scx;
TileType type = TiGetType(tile);
@ -1100,10 +1103,10 @@ mzDestWalksFunc(tile, dinfo, cxp)
*/
int
mzHWalksFunc(tile, dinfo, cdarg)
Tile *tile;
TileType dinfo;
ClientData cdarg;
mzHWalksFunc(
Tile *tile,
TileType dinfo,
ClientData cdarg)
{
RouteType *rT = (RouteType *) cdarg;
@ -1189,10 +1192,10 @@ mzHWalksFunc(tile, dinfo, cdarg)
*/
int
mzVWalksFunc(tile, dinfo, cdarg)
Tile *tile;
TileType dinfo;
ClientData cdarg;
mzVWalksFunc(
Tile *tile,
TileType dinfo,
ClientData cdarg)
{
RouteType *rT = (RouteType *) cdarg;
@ -1288,10 +1291,10 @@ typedef struct walkContactFuncData
*/
int
mzLRCWalksFunc(tile, dinfo, cdarg)
Tile *tile;
TileType dinfo; /* (unused) */
ClientData cdarg;
mzLRCWalksFunc(
Tile *tile,
TileType dinfo, /* (unused) */
ClientData cdarg)
{
RouteType *rT = (RouteType *) cdarg; /* RouteType of this dest area */
RouteContact *rC;
@ -1372,10 +1375,10 @@ mzLRCWalksFunc(tile, dinfo, cdarg)
*/
int
mzUDCWalksFunc(tile, dinfo, cdarg)
Tile *tile;
TileType dinfo; /* (unused) */
ClientData cdarg;
mzUDCWalksFunc(
Tile *tile,
TileType dinfo, /* (unused) */
ClientData cdarg)
{
RouteType *rT = (RouteType *) cdarg; /* RouteType of this dest area */
RouteContact *rC;
@ -1458,9 +1461,9 @@ mzUDCWalksFunc(tile, dinfo, cdarg)
*/
int
mzCWalksFunc2(tile, cdarg)
Tile *tile;
ClientData cdarg;
mzCWalksFunc2(
Tile *tile,
ClientData cdarg)
{
WalkContactFuncData *wD = (WalkContactFuncData *) cdarg;
Rect rect;

52
mzrouter/mzDebug.c
View File

@ -67,8 +67,8 @@ extern void mzPrintPathHead();
*/
void
MZPrintRCListNames(l)
List *l;
MZPrintRCListNames(
List *l)
{
RouteContact *rC;
@ -101,8 +101,8 @@ MZPrintRCListNames(l)
*/
void
MZPrintRLListNames(l)
List *l;
MZPrintRLListNames(
List *l)
{
RouteLayer *rL;
@ -135,8 +135,8 @@ MZPrintRLListNames(l)
*/
void
MZPrintRLs(rL)
RouteLayer *rL;
MZPrintRLs(
RouteLayer *rL)
{
while(rL!=NULL)
{
@ -166,8 +166,8 @@ MZPrintRLs(rL)
*/
void
mzPrintRL(rL)
RouteLayer *rL;
mzPrintRL(
RouteLayer *rL)
{
List *cL;
@ -224,8 +224,8 @@ mzPrintRL(rL)
*/
void
mzPrintRT(rT)
RouteType *rT;
mzPrintRT(
RouteType *rT)
{
int i;
@ -282,8 +282,8 @@ mzPrintRT(rT)
*/
void
MZPrintRCs(rC)
RouteContact *rC;
MZPrintRCs(
RouteContact *rC)
{
while(rC!=NULL)
{
@ -312,8 +312,8 @@ MZPrintRCs(rC)
*/
void
mzPrintRC(rC)
RouteContact *rC;
mzPrintRC(
RouteContact *rC)
{
TxPrintf("ROUTE CONTACT:\n");
mzPrintRT(&(rC->rc_routeType));
@ -348,8 +348,8 @@ mzPrintRC(rC)
*/
void
mzPrintRPs(path)
RoutePath *path;
mzPrintRPs(
RoutePath *path)
{
while(path!=NULL)
{
@ -377,8 +377,8 @@ mzPrintRPs(path)
*/
void
mzPrintRP(path)
RoutePath *path;
mzPrintRP(
RoutePath *path)
{
TxPrintf("ROUTE PATH:");
TxPrintf(" layer = %s",
@ -415,8 +415,8 @@ mzPrintRP(path)
/* mzPrintPathHead -- */
void
mzPrintPathHead(path)
RoutePath *path;
mzPrintPathHead(
RoutePath *path)
{
if(path==NULL)
@ -479,8 +479,8 @@ mzPrintPathHead(path)
*/
void
mzDumpTags(area)
Rect *area;
mzDumpTags(
Rect *area)
{
int mzDumpTagsFunc();
SearchContext scx;
@ -526,10 +526,10 @@ mzDumpTags(area)
*/
int
mzDumpTagsFunc(tile, dinfo, cxp)
Tile *tile;
TileType dinfo; /* (unused) */
TreeContext *cxp;
mzDumpTagsFunc(
Tile *tile,
TileType dinfo, /* (unused) */
TreeContext *cxp)
{
SearchContext *scx = cxp->tc_scx;
Rect r;

126
mzrouter/mzEstimate.c
View File

@ -487,10 +487,10 @@ mzCleanEstimate()
*/
int
mzReclaimTCFunc(tile, dinfo, notUsed)
Tile *tile;
TileType dinfo;
ClientData notUsed;
mzReclaimTCFunc(
Tile *tile,
TileType dinfo,
ClientData notUsed)
{
if (tile->ti_client != (ClientData)CLIENTDEFAULT)
{
@ -537,10 +537,10 @@ mzReclaimTCFunc(tile, dinfo, notUsed)
*/
int
mzProcessDestEstFunc(tile, dinfo, cxp)
Tile *tile;
TileType dinfo; /* (unused) */
TreeContext *cxp;
mzProcessDestEstFunc(
Tile *tile,
TileType dinfo, /* (unused) */
TreeContext *cxp)
{
SearchContext *scx = cxp->tc_scx;
TileType type = TiGetType(tile);
@ -610,10 +610,10 @@ mzProcessDestEstFunc(tile, dinfo, cxp)
*/
int
mzDestTileEstFunc(tile, dinfo, cdarg)
Tile *tile;
TileType dinfo;
ClientData cdarg;
mzDestTileEstFunc(
Tile *tile,
TileType dinfo,
ClientData cdarg)
{
Rect rect;
@ -661,10 +661,10 @@ mzDestTileEstFunc(tile, dinfo, cdarg)
*/
int
mzAddSubcellEstFunc(scx, dinfo, cdarg)
SearchContext *scx;
TileType dinfo;
ClientData cdarg;
mzAddSubcellEstFunc(
SearchContext *scx,
TileType dinfo,
ClientData cdarg)
{
Rect r, rDest;
@ -703,10 +703,10 @@ mzAddSubcellEstFunc(scx, dinfo, cdarg)
*/
int
mzAddFenceEstFunc(tile, dinfo, buildArea)
Tile *tile;
TileType dinfo;
Rect *buildArea; /* currently ignored */
mzAddFenceEstFunc(
Tile *tile,
TileType dinfo,
Rect *buildArea) /* currently ignored */
{
Rect r;
@ -742,10 +742,10 @@ mzAddFenceEstFunc(tile, dinfo, buildArea)
*/
int
mzBuildSolidsListFunc(tile, dinfo, listPtr)
Tile *tile;
TileType dinfo;
List **listPtr; /* pointer to list to add tile to */
mzBuildSolidsListFunc(
Tile *tile,
TileType dinfo,
List **listPtr) /* pointer to list to add tile to */
{
LIST_ADD(tile,*listPtr);
@ -770,10 +770,10 @@ mzBuildSolidsListFunc(tile, dinfo, listPtr)
* ----------------------------------------------------------------------------
*/
int
mzAssignCostsFunc(tile, dinfo, spaceCosts)
Tile *tile;
TileType dinfo;
TileCosts *spaceCosts; /* costs to assign to space tiles */
mzAssignCostsFunc(
Tile *tile,
TileType dinfo,
TileCosts *spaceCosts) /* costs to assign to space tiles */
{
Tile *tRight, *tUp;
TileCosts *newCosts;
@ -869,10 +869,10 @@ mzAssignCostsFunc(tile, dinfo, spaceCosts)
* ----------------------------------------------------------------------------
*/
int
mzDestInitialAssignFunc(tile, dinfo, cdarg)
Tile *tile;
TileType dinfo;
ClientData cdarg;
mzDestInitialAssignFunc(
Tile *tile,
TileType dinfo,
ClientData cdarg)
{
Heap *adjHeap = (Heap *) cdarg;
Vertex *v;
@ -912,10 +912,10 @@ mzDestInitialAssignFunc(tile, dinfo, cdarg)
*/
int
mzBuildEstimatesFunc(tile, dinfo, notUsed)
Tile *tile;
TileType dinfo;
ClientData notUsed;
mzBuildEstimatesFunc(
Tile *tile,
TileType dinfo,
ClientData notUsed)
{
mzBuildCornerEstimators(tile);
@ -943,8 +943,8 @@ mzBuildEstimatesFunc(tile, dinfo, notUsed)
*/
void
mzBuildCornerEstimators(tile)
Tile *tile;
mzBuildCornerEstimators(
Tile *tile)
{
TileCosts *tc = (TileCosts *) (tile->ti_client);
Vertex *vLLeft = NULL;
@ -1104,8 +1104,8 @@ mzBuildCornerEstimators(tile)
* ----------------------------------------------------------------------------
*/
void
mzBuildStraightShotEstimators(tile)
Tile *tile;
mzBuildStraightShotEstimators(
Tile *tile)
{
TileCosts *tc = (TileCosts *) (tile->ti_client);
@ -1257,10 +1257,10 @@ mzBuildStraightShotEstimators(tile)
*/
bool
AlwaysAsGood(est1, est2, tile)
Estimate *est1;
Estimate *est2;
Tile *tile;
AlwaysAsGood(
Estimate *est1,
Estimate *est2,
Tile *tile)
{
if(est1->e_cost0 > est2->e_cost0)
{
@ -1325,10 +1325,10 @@ AlwaysAsGood(est1, est2, tile)
*/
int
mzTrimEstimatesFunc(tile, dinfo, notUsed)
Tile *tile;
TileType dinfo;
ClientData notUsed;
mzTrimEstimatesFunc(
Tile *tile,
TileType dinfo,
ClientData notUsed)
{
TileCosts *tc = (TileCosts *) (tile->ti_client);
Estimate *e;
@ -1403,9 +1403,9 @@ mzTrimEstimatesFunc(tile, dinfo, notUsed)
*/
void
mzSplitTiles(plane, point)
Plane * plane;
Point * point; /* origin from which tiles split */
mzSplitTiles(
Plane * plane,
Point * point) /* origin from which tiles split */
{
Tile *pointTile = TiSrPointNoHint(plane, point);
Tile *t;
@ -1588,9 +1588,9 @@ mzAssignVertexCosts()
*/
void
mzAddVertex(vxThis, adjHeap)
Vertex *vxThis;
Heap *adjHeap;
mzAddVertex(
Vertex *vxThis,
Heap *adjHeap)
{
Tile *tThis; /* Tile vxThis is attached to */
Point loc; /* location of vxThis */
@ -1886,8 +1886,8 @@ noLeft:;
// changed from DoubleInt to dlong
dlong
mzEstimatedCost(point)
Point *point;
mzEstimatedCost(
Point *point)
{
Tile *t = TiSrPointNoHint(mzEstimatePlane, point);
TileCosts *tc = ((TileCosts *) t->ti_client);
@ -1931,9 +1931,9 @@ mzEstimatedCost(point)
*/
void
mzDumpEstimates(area,fd)
Rect *area;
FILE *fd;
mzDumpEstimates(
Rect *area,
FILE *fd)
{
int mzDumpEstFunc();
@ -1976,10 +1976,10 @@ mzDumpEstimates(area,fd)
*/
int
mzDumpEstFunc(tile, dinfo, fd)
Tile *tile;
TileType dinfo;
FILE *fd;
mzDumpEstFunc(
Tile *tile,
TileType dinfo,
FILE *fd)
{
Rect r;
TileCosts *tilec = (TileCosts *) tile->ti_client;

40
mzrouter/mzMain.c
View File

@ -269,8 +269,8 @@ do \
*/
MazeParameters *
MZCopyParms(oldParms)
MazeParameters *oldParms; /* Maze routing parameters */
MZCopyParms(
MazeParameters *oldParms) /* Maze routing parameters */
{
MazeParameters *newParms;
HashTable aT; /* Address translation hash table */
@ -415,8 +415,8 @@ MZCopyParms(oldParms)
*/
MazeParameters *
MZFindStyle(name)
char *name; /* name of style we are looking for */
MZFindStyle(
char *name) /* name of style we are looking for */
{
MazeStyle *style = mzStyles;
@ -457,10 +457,10 @@ char *name; /* name of style we are looking for */
*/
void
MZInitRoute(parms, routeUse, expansionMask)
MazeParameters *parms; /* Maze routing parameters */
CellUse *routeUse; /* toplevel cell router sees */
int expansionMask; /* which subcells are expanded - NOTE: the
MZInitRoute(
MazeParameters *parms, /* Maze routing parameters */
CellUse *routeUse, /* toplevel cell router sees */
int expansionMask) /* which subcells are expanded - NOTE: the
* maze router interpets a 0 mask to mean
* all cells are expanded
*/
@ -568,9 +568,9 @@ MZInitRoute(parms, routeUse, expansionMask)
*/
void
MZAddStart(point, type)
Point *point;
TileType type;
MZAddStart(
Point *point,
TileType type)
{
/* Disable undo to avoid overhead on paint operations to internal planes */
UndoDisable();
@ -668,9 +668,9 @@ MZAddStart(point, type)
*/
void
MZAddDest(rect, type)
Rect *rect;
TileType type;
MZAddDest(
Rect *rect,
TileType type)
{
ColoredRect *dTerm;
@ -721,8 +721,8 @@ MZAddDest(rect, type)
*/
RoutePath *
MZRoute(mzResult)
int *mzResult; /* Place to put result code */
MZRoute(
int *mzResult) /* Place to put result code */
{
RoutePath *path; /* handle for result of search */
ColoredRect *term;
@ -877,8 +877,8 @@ abort:
*/
void
MZCleanupPath(pathList)
RoutePath *pathList;
MZCleanupPath(
RoutePath *pathList)
{
RoutePath *path, *n1path, *n2path, *n3path;
RoutePath *spath, *cpath, *mpath;
@ -1149,8 +1149,8 @@ MZCleanupPath(pathList)
*/
CellUse *
MZPaintPath(pathList)
RoutePath *pathList;
MZPaintPath(
RoutePath *pathList)
{
RoutePath *path, *prev;
RouteLayer *last_rL = NULL;

22
mzrouter/mzNumLine.c
View File

@ -64,9 +64,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/
void
mzNLInit(nL, size)
NumberLine *nL;
int size; /*initial size of number line */
mzNLInit(
NumberLine *nL,
int size) /*initial size of number line */
{
int *entries;
size = MAX(size, 2);
@ -101,9 +101,9 @@ mzNLInit(nL, size)
*/
void
mzNLInsert(nL,x)
NumberLine *nL;
int x; /* new point */
mzNLInsert(
NumberLine *nL,
int x) /* new point */
{
int lowI, highI;
@ -205,9 +205,9 @@ mzNLInsert(nL,x)
*/
int *
mzNLGetContainingInterval(nL,x)
NumberLine *nL;
int x; /* new point */
mzNLGetContainingInterval(
NumberLine *nL,
int x) /* new point */
{
int lowI, highI;
@ -256,8 +256,8 @@ mzNLGetContainingInterval(nL,x)
*/
void
mzNLClear(nL)
NumberLine *nL;
mzNLClear(
NumberLine *nL)
{
nL->nl_entries[0] = MINFINITY;

35
mzrouter/mzSearch.c
View File

@ -179,8 +179,8 @@ extern void mzExtendPath(RoutePath *);
* ----------------------------------------------------------------------------
*/
RoutePath *
mzSearch(mzResult)
int *mzResult;
mzSearch(
int *mzResult)
{
RoutePath *path; /* solution */
bool morePartialPaths = TRUE;
@ -728,8 +728,8 @@ mzSearch(mzResult)
*/
void
mzExtendPath(path)
RoutePath *path;
mzExtendPath(
RoutePath *path)
{
int extendCode = path->rp_extendCode;
@ -813,8 +813,8 @@ mzExtendPath(path)
* ----------------------------------------------------------------------------
*/
void
mzExtendViaLRContacts(path)
RoutePath *path;
mzExtendViaLRContacts(
RoutePath *path)
{
Point p = path->rp_entry, *lastCpos = NULL;
RouteLayer *rLayer = path->rp_rLayer;
@ -1010,8 +1010,8 @@ mzExtendViaLRContacts(path)
* ----------------------------------------------------------------------------
*/
void
mzExtendViaUDContacts(path)
RoutePath *path;
mzExtendViaUDContacts(
RoutePath *path)
{
Point p = path->rp_entry, *lastCpos = NULL;
RouteLayer *rLayer = path->rp_rLayer;
@ -1208,17 +1208,16 @@ mzExtendViaUDContacts(path)
* ----------------------------------------------------------------------------
*/
void
mzAddPoint(path, p, rLayer, orient, extendCode, costptr)
RoutePath *path; /* path that new point extends */
Point *p; /* new point */
RouteLayer *rLayer; /* Route Layer of new point */
int orient; /* 'H' = endpt of hor seg, 'V' = endpt of vert seg,
mzAddPoint(
RoutePath *path, /* path that new point extends */
Point *p, /* new point */
RouteLayer *rLayer, /* Route Layer of new point */
int orient, /* 'H' = endpt of hor seg, 'V' = endpt of vert seg,
* 'O' = LR contact, 'X' = UD contact,
* 'B' = first point in path and blocked
*/
int extendCode; /* interesting directions to extend in */
dlong *costptr; /* Incremental cost of new path segment */
int extendCode, /* interesting directions to extend in */
dlong *costptr) /* Incremental cost of new path segment */
{
RoutePath *newPath;
RoutePath *hashedPath;
@ -1459,8 +1458,8 @@ mzAddPoint(path, p, rLayer, orient, extendCode, costptr)
* ----------------------------------------------------------------------------
*/
void
mzBloomInit(path)
RoutePath *path; /* path that new point extends */
mzBloomInit(
RoutePath *path) /* path that new point extends */
{
ASSERT(mzBloomStack==NULL,"mzBloomInit");

29
mzrouter/mzStart.c
View File

@ -59,7 +59,10 @@ extern bool mzAddInitialContacts();
*/
int
mzFindSamenodeFunc(Tile *tile, TileType dinfo, Point *point)
mzFindSamenodeFunc(
Tile *tile,
TileType dinfo,
Point *point)
{
*point = tile->ti_ll;
return 1;
@ -88,8 +91,8 @@ mzFindSamenodeFunc(Tile *tile, TileType dinfo, Point *point)
#define EC_ALL_DIRECTIONS (EC_RIGHT | EC_LEFT | EC_UP | EC_DOWN)
bool
mzStart(term)
ColoredRect *term;
mzStart(
ColoredRect *term)
{
RouteLayer *rL;
RouteContact *rC;
@ -204,13 +207,13 @@ mzStart(term)
* ----------------------------------------------------------------------------
*/
bool
mzExtendInitPath(path, rL, point, cost, length, directions)
RoutePath *path; /* Initial Path, being extended */
RouteLayer *rL; /* routelayer of new point */
Point point; /* new point for initPath */
dlong cost; /* cost of new segment */
int length; /* length of path (excluding new segment) */
int directions; /* directions to extend init path in */
mzExtendInitPath(
RoutePath *path, /* Initial Path, being extended */
RouteLayer *rL, /* routelayer of new point */
Point point, /* new point for initPath */
dlong cost, /* cost of new segment */
int length, /* length of path (excluding new segment) */
int directions) /* directions to extend init path in */
{
Tile *tp;
bool returnCode = TRUE;
@ -321,9 +324,9 @@ mzExtendInitPath(path, rL, point, cost, length, directions)
*/
bool
mzAddInitialContacts(rL, point)
RouteLayer *rL; /* routelayer of initial point */
Point point; /* initial point */
mzAddInitialContacts(
RouteLayer *rL, /* routelayer of initial point */
Point point) /* initial point */
{
List *cL;
Tile *tp;

42
mzrouter/mzSubrs.c
View File

@ -290,10 +290,10 @@ int mzMakeEndpoints; /* Set to MZ_EXPAND_START, MZ_EXPAND_DEST, or
*/
void
mzMarkConnectedTiles(rect, type, expandType)
Rect *rect;
TileType type;
int expandType;
mzMarkConnectedTiles(
Rect *rect,
TileType type,
int expandType)
{
List *expandList = NULL; /* areas remaining to be expanded from */
@ -412,10 +412,10 @@ mzMarkConnectedTiles(rect, type, expandType)
*/
int
mzConnectedTileFunc(tile, dinfo, cxp)
Tile *tile;
TileType dinfo; /* (unused) */
TreeContext *cxp;
mzConnectedTileFunc(
Tile *tile,
TileType dinfo, /* (unused) */
TreeContext *cxp)
{
/* If tile not marked, mark it, add it to marked list, and add
* corresponding area to expand list. Mark start tiles MZ_EXPAND_START
@ -514,9 +514,9 @@ mzConnectedTileFunc(tile, dinfo, cxp)
*/
int
mzConnectedSubcellFunc(scx, cdarg)
SearchContext *scx;
ClientData cdarg;
mzConnectedSubcellFunc(
SearchContext *scx,
ClientData cdarg)
{
CellUse *cu = scx->scx_use;
@ -550,8 +550,9 @@ mzConnectedSubcellFunc(scx, cdarg)
*/
RouteContact *
MZGetContact(path, prev)
RoutePath *path, *prev;
MZGetContact(
RoutePath *path,
RoutePath *prev)
{
RouteContact *rC;
List *cL;
@ -586,8 +587,9 @@ MZGetContact(path, prev)
*/
int
mzPaintContact(path, prev)
RoutePath *path, *prev;
mzPaintContact(
RoutePath *path,
RoutePath *prev)
{
RouteContact *rC;
int pNum, pNumC, cWidth;
@ -670,8 +672,8 @@ mzPaintContact(path, prev)
*/
RoutePath *
mzCopyPath(path)
RoutePath *path;
mzCopyPath(
RoutePath *path)
{
RoutePath *newHead, *newPrev, *new;
@ -795,9 +797,9 @@ mzFreeAllRPaths()
*/
bool
mzPresent(rL,touchingTypes)
RouteLayer *rL;
TileTypeBitMask *touchingTypes;
mzPresent(
RouteLayer *rL,
TileTypeBitMask *touchingTypes)
{
List *l;

84
mzrouter/mzTech.c
View File

@ -117,8 +117,8 @@ void mzEdgeRule(int, char **);
*/
void
MZFreeParameters(params)
MazeParameters *params;
MZFreeParameters(
MazeParameters *params)
{
RouteLayer *rL;
RouteContact *rC;
@ -331,10 +331,10 @@ MZAfterTech()
*/
bool
MZTechLine(sectionName, argc, argv)
char *sectionName; /* Unused */
int argc;
char *argv[];
MZTechLine(
char *sectionName, /* Unused */
int argc,
char *argv[])
{
if(strcmp(argv[0], "style") == 0)
{
@ -399,9 +399,9 @@ MZTechLine(sectionName, argc, argv)
*/
void
mzTechStyle(argc, argv)
int argc;
char *argv[];
mzTechStyle(
int argc,
char *argv[])
{
/* if there is a previous style, complete processing on it */
@ -514,8 +514,8 @@ mzStyleEnd()
* ----------------------------------------------------------------------------
*/
void
mzSetParmDefaults(parms)
MazeParameters *parms;
mzSetParmDefaults(
MazeParameters *parms)
{
/* initialize penalty factor for excess cost togo */
@ -583,9 +583,9 @@ mzSetParmDefaults(parms)
*/
void
mzTechLayer(argc, argv)
int argc;
char *argv[];
mzTechLayer(
int argc,
char *argv[])
{
RouteLayer *new;
TileType tileType;
@ -745,9 +745,9 @@ mzTechLayer(argc, argv)
*/
void
mzTechNotActive(argc, argv)
int argc;
char *argv[];
mzTechNotActive(
int argc,
char *argv[])
{
int argI;
TileType tileType;
@ -811,9 +811,9 @@ mzTechNotActive(argc, argv)
*/
void
mzTechSpacing(argc, argv)
int argc;
char *argv[];
mzTechSpacing(
int argc,
char *argv[])
{
TechSpacing *new;
TileType tileType;
@ -932,9 +932,9 @@ mzTechSpacing(argc, argv)
*/
void
mzTechSearch(argc, argv)
int argc;
char *argv[];
mzTechSearch(
int argc,
char *argv[])
{
/* check number of arguments */
if(argc != 4)
@ -1036,9 +1036,9 @@ mzTechSearch(argc, argv)
*/
void
mzTechWidth(argc, argv)
int argc;
char *argv[];
mzTechWidth(
int argc,
char *argv[])
{
TileType tileType;
RouteType *rT;
@ -1133,9 +1133,9 @@ mzTechWidth(argc, argv)
*/
void
mzTechContact(argc, argv)
int argc;
char *argv[];
mzTechContact(
int argc,
char *argv[])
{
RouteContact *new;
TileType type, tileType;
@ -1225,9 +1225,9 @@ mzTechContact(argc, argv)
*/
void
mzInitRouteType(rT,tileType)
RouteType *rT;
TileType tileType;
mzInitRouteType(
RouteType *rT,
TileType tileType)
{
int t;
@ -1296,8 +1296,8 @@ mzInitRouteType(rT,tileType)
*/
RouteType *
mzFindRouteType(type)
TileType type;
mzFindRouteType(
TileType type)
{
RouteType *rT;
@ -1326,8 +1326,8 @@ mzFindRouteType(type)
*/
RouteLayer *
mzFindRouteLayer(type)
TileType type;
mzFindRouteLayer(
TileType type)
{
RouteLayer *rL;
@ -1356,8 +1356,8 @@ mzFindRouteLayer(type)
*/
RouteContact *
mzFindRouteContact(type)
TileType type;
mzFindRouteContact(
TileType type)
{
RouteContact *rC;
@ -1390,10 +1390,10 @@ mzFindRouteContact(type)
*/
void
mzUpdateSpacing(rType,tType,distance)
RouteType *rType; /* Route Type to which spacing applies */
TileType tType; /* spacing from this tiletype */
int distance; /* min spacing betweeen rType and tType */
mzUpdateSpacing(
RouteType *rType, /* Route Type to which spacing applies */
TileType tType, /* spacing from this tiletype */
int distance) /* min spacing betweeen rType and tType */
{
rType->rt_spacing[tType] =
MAX(rType->rt_spacing[tType],distance);

54
mzrouter/mzTestCmd.c
View File

@ -79,9 +79,9 @@ extern const TestCmdTableE mzTestCommands[];
*/
void
mzDebugTstCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzDebugTstCmd(
MagWindow *w,
TxCommand *cmd)
{
int result;
bool value;
@ -133,9 +133,9 @@ mzDebugTstCmd(w, cmd)
*/
void
mzDumpEstimatesTstCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzDumpEstimatesTstCmd(
MagWindow *w,
TxCommand *cmd)
{
if (cmd->tx_argc > 2)
{
@ -180,9 +180,9 @@ mzDumpEstimatesTstCmd(w, cmd)
*/
void
mzDumpTagsTstCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzDumpTagsTstCmd(
MagWindow *w,
TxCommand *cmd)
{
if (cmd->tx_argc > 2)
{
@ -227,9 +227,9 @@ mzDumpTagsTstCmd(w, cmd)
*/
void
mzHelpTstCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzHelpTstCmd(
MagWindow *w,
TxCommand *cmd)
{
int n;
int which;
@ -303,9 +303,9 @@ mzHelpTstCmd(w, cmd)
*/
void
mzNumberLineTstCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzNumberLineTstCmd(
MagWindow *w,
TxCommand *cmd)
{
NumberLine myLine;
int *result;
@ -382,9 +382,9 @@ mzNumberLineTstCmd(w, cmd)
*/
void
mzParmsTstCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzParmsTstCmd(
MagWindow *w,
TxCommand *cmd)
{
MZPrintRLs(mzRouteLayers);
@ -413,9 +413,9 @@ mzParmsTstCmd(w, cmd)
*/
void
mzPlaneTstCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzPlaneTstCmd(
MagWindow *w,
TxCommand *cmd)
{
TileType t;
RouteType *rT;
@ -486,9 +486,9 @@ mzPlaneTstCmd(w, cmd)
*/
void
mzVersionCmd(w, cmd)
MagWindow *w;
TxCommand *cmd;
mzVersionCmd(
MagWindow *w,
TxCommand *cmd)
{
if(cmd->tx_argc == 2)
@ -573,9 +573,9 @@ const TestCmdTableE mzTestCommands[] = {
}, *mzTestCmdP;
void
MZTest(w, cmd)
MagWindow *w;
TxCommand *cmd;
MZTest(
MagWindow *w,
TxCommand *cmd)
{
int n;
int which;

24
mzrouter/mzWalk.c
View File

@ -54,8 +54,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header:";
* ----------------------------------------------------------------------------
*/
void
mzWalkRight(path)
RoutePath *path;
mzWalkRight(
RoutePath *path)
{
Point pOrg; /* point to extend from */
Point pNew; /* next interesting point in direction of extension */
@ -172,8 +172,8 @@ mzWalkRight(path)
* ----------------------------------------------------------------------------
*/
void
mzWalkLeft(path)
RoutePath *path;
mzWalkLeft(
RoutePath *path)
{
Point pOrg; /* point to extend from */
Point pNew; /* next interesting point in direction of extension */
@ -293,8 +293,8 @@ mzWalkLeft(path)
* ----------------------------------------------------------------------------
*/
void
mzWalkUp(path)
RoutePath *path;
mzWalkUp(
RoutePath *path)
{
Point pOrg; /* point to extend from */
Point pNew; /* next interesting point in direction of extension */
@ -411,8 +411,8 @@ mzWalkUp(path)
* ----------------------------------------------------------------------------
*/
void
mzWalkDown(path)
RoutePath *path;
mzWalkDown(
RoutePath *path)
{
Point pOrg; /* point to extend from */
Point pNew; /* next interesting point in direction of extension */
@ -531,8 +531,8 @@ mzWalkDown(path)
* ----------------------------------------------------------------------------
*/
void
mzWalkLRContact(path)
RoutePath *path;
mzWalkLRContact(
RoutePath *path)
{
Point pOrg; /* point to extend from */
int extendCode; /* Interesting directions to extend in */
@ -618,8 +618,8 @@ mzWalkLRContact(path)
* ----------------------------------------------------------------------------
*/
void
mzWalkUDContact(path)
RoutePath *path;
mzWalkUDContact(
RoutePath *path)
{
Point pOrg; /* point to extend from */
int extendCode; /* Interesting directions to extend in */

4
mzrouter/mzXtndDown.c
View File

@ -53,8 +53,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
* ----------------------------------------------------------------------------
*/
void
mzExtendDown(path)
RoutePath *path;
mzExtendDown(
RoutePath *path)
{
Point pOrg; /* point to extend from */
Point pStep; /* one unit from pOrg in direction of extension */

4
mzrouter/mzXtndLeft.c
View File

@ -53,8 +53,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
* ----------------------------------------------------------------------------
*/
void
mzExtendLeft(path)
RoutePath *path;
mzExtendLeft(
RoutePath *path)
{
Point pOrg; /* point to extend from */
Point pStep; /* one unit from pOrg in direction of extension */

4
mzrouter/mzXtndUp.c
View File

@ -53,8 +53,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
* ----------------------------------------------------------------------------
*/
void
mzExtendUp(path)
RoutePath *path;
mzExtendUp(
RoutePath *path)
{
Point pOrg; /* point to extend from */
Point pStep; /* one unit from pOrg in direction of extension */