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

irouter: convert K&R function definitions to ANSI C 

Convert the old-style (K&R) function definitions in irouter/ 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.

Updates irInternal.h with prototypes for the affected declarations.

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 996b292a80
commit ee6901c02c
No known key found for this signature in database
GPG Key ID: 588785BFDFB01ABD
5 changed files with 227 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

326
irouter/irCommand.c
View File

@ -96,10 +96,10 @@ extern const SubCmdTableE irSubcommands[];
*/ */
void void
irSetNoisyAutoInt(parm, valueS, file) irSetNoisyAutoInt(
int *parm; int *parm,
char *valueS; char *valueS,
FILE *file; FILE *file)
{ {
int which; int which;
@ -208,10 +208,10 @@ irSetNoisyAutoInt(parm, valueS, file)
/* irLSetActive -- */ /* irLSetActive -- */
Tcl_Obj * Tcl_Obj *
irLSetActive(rL,s,file) irLSetActive(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewBooleanObj(rL->rl_routeType.rt_active); return Tcl_NewBooleanObj(rL->rl_routeType.rt_active);
@ -221,10 +221,10 @@ irLSetActive(rL,s,file)
/* irLSetWidth -- */ /* irLSetWidth -- */
Tcl_Obj * Tcl_Obj *
irLSetWidth(rL,s,file) irLSetWidth(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rL->rl_routeType.rt_width); return Tcl_NewIntObj(rL->rl_routeType.rt_width);
@ -234,10 +234,10 @@ irLSetWidth(rL,s,file)
/* irLSetLength -- */ /* irLSetLength -- */
Tcl_Obj * Tcl_Obj *
irLSetLength(rL,s,file) irLSetLength(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rL->rl_routeType.rt_length); return Tcl_NewIntObj(rL->rl_routeType.rt_length);
@ -247,10 +247,10 @@ irLSetLength(rL,s,file)
/* irLSetHCost -- */ /* irLSetHCost -- */
Tcl_Obj * Tcl_Obj *
irLSetHCost(rL,s,file) irLSetHCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rL->rl_hCost); return Tcl_NewIntObj(rL->rl_hCost);
@ -260,10 +260,10 @@ irLSetHCost(rL,s,file)
/* irLSetVCost -- */ /* irLSetVCost -- */
Tcl_Obj * Tcl_Obj *
irLSetVCost(rL,s,file) irLSetVCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rL->rl_vCost); return Tcl_NewIntObj(rL->rl_vCost);
@ -273,10 +273,10 @@ irLSetVCost(rL,s,file)
/* irLSetJogCost -- */ /* irLSetJogCost -- */
Tcl_Obj * Tcl_Obj *
irLSetJogCost(rL,s,file) irLSetJogCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rL->rl_jogCost); return Tcl_NewIntObj(rL->rl_jogCost);
@ -286,10 +286,10 @@ irLSetJogCost(rL,s,file)
/* irLSetHintCost -- */ /* irLSetHintCost -- */
Tcl_Obj * Tcl_Obj *
irLSetHintCost(rL,s,file) irLSetHintCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rL->rl_hintCost); return Tcl_NewIntObj(rL->rl_hintCost);
@ -299,10 +299,10 @@ irLSetHintCost(rL,s,file)
/* irLSetOverCost -- */ /* irLSetOverCost -- */
Tcl_Obj * Tcl_Obj *
irLSetOverCost(rL,s,file) irLSetOverCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rL->rl_overCost); return Tcl_NewIntObj(rL->rl_overCost);
@ -314,60 +314,60 @@ irLSetOverCost(rL,s,file)
/* irLSetActive -- */ /* irLSetActive -- */
void void
irLSetActive(rL,s,file) irLSetActive(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyBool(&(rL->rl_routeType.rt_active),s,file); SetNoisyBool(&(rL->rl_routeType.rt_active),s,file);
} }
/* irLSetWidth -- */ /* irLSetWidth -- */
void void
irLSetWidth(rL,s,file) irLSetWidth(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rL->rl_routeType.rt_width),s,file); SetNoisyInt(&(rL->rl_routeType.rt_width),s,file);
} }
/* irLSetLength -- */ /* irLSetLength -- */
void void
irLSetLength(rL,s,file) irLSetLength(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rL->rl_routeType.rt_length),s,file); SetNoisyInt(&(rL->rl_routeType.rt_length),s,file);
} }
/* irLSetHCost -- */ /* irLSetHCost -- */
void void
irLSetHCost(rL,s,file) irLSetHCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rL->rl_hCost),s,file); SetNoisyInt(&(rL->rl_hCost),s,file);
} }
/* irLSetVCost -- */ /* irLSetVCost -- */
void void
irLSetVCost(rL,s,file) irLSetVCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rL->rl_vCost),s,file); SetNoisyInt(&(rL->rl_vCost),s,file);
} }
/* irLSetJogCost -- */ /* irLSetJogCost -- */
void void
irLSetJogCost(rL,s,file) irLSetJogCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rL->rl_jogCost),s,file); SetNoisyInt(&(rL->rl_jogCost),s,file);
} }
@ -375,20 +375,20 @@ irLSetJogCost(rL,s,file)
/* irLSetHintCost -- */ /* irLSetHintCost -- */
void void
irLSetHintCost(rL,s,file) irLSetHintCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rL->rl_hintCost),s,file); SetNoisyInt(&(rL->rl_hintCost),s,file);
} }
/* irLSetOverCost -- */ /* irLSetOverCost -- */
void void
irLSetOverCost(rL,s,file) irLSetOverCost(
RouteLayer *rL; RouteLayer *rL,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rL->rl_overCost),s,file); SetNoisyInt(&(rL->rl_overCost),s,file);
} }
@ -418,10 +418,10 @@ irLSetOverCost(rL,s,file)
/* irCSetActive -- */ /* irCSetActive -- */
Tcl_Obj * Tcl_Obj *
irCSetActive(rC,s, file) irCSetActive(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewBooleanObj(rC->rc_routeType.rt_active); return Tcl_NewBooleanObj(rC->rc_routeType.rt_active);
@ -431,10 +431,10 @@ irCSetActive(rC,s, file)
/* irCSetWidth -- */ /* irCSetWidth -- */
Tcl_Obj * Tcl_Obj *
irCSetWidth(rC,s,file) irCSetWidth(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rC->rc_routeType.rt_width); return Tcl_NewIntObj(rC->rc_routeType.rt_width);
@ -444,10 +444,10 @@ irCSetWidth(rC,s,file)
/* irCSetLength-- */ /* irCSetLength-- */
Tcl_Obj * Tcl_Obj *
irCSetLength(rC,s,file) irCSetLength(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rC->rc_routeType.rt_length); return Tcl_NewIntObj(rC->rc_routeType.rt_length);
@ -457,10 +457,10 @@ irCSetLength(rC,s,file)
/* irCSetCost -- */ /* irCSetCost -- */
Tcl_Obj * Tcl_Obj *
irCSetCost(rC,s,file) irCSetCost(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
if (file == (FILE *)1) if (file == (FILE *)1)
return Tcl_NewIntObj(rC->rc_cost); return Tcl_NewIntObj(rC->rc_cost);
@ -472,40 +472,40 @@ irCSetCost(rC,s,file)
/* irCSetActive -- */ /* irCSetActive -- */
void void
irCSetActive(rC,s, file) irCSetActive(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyBool(&(rC->rc_routeType.rt_active),s,file); SetNoisyBool(&(rC->rc_routeType.rt_active),s,file);
} }
/* irCSetWidth -- */ /* irCSetWidth -- */
void void
irCSetWidth(rC,s,file) irCSetWidth(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rC->rc_routeType.rt_width),s,file); SetNoisyInt(&(rC->rc_routeType.rt_width),s,file);
} }
/* irCSetLength -- */ /* irCSetLength -- */
void void
irCSetLength(rC,s,file) irCSetLength(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rC->rc_routeType.rt_length),s,file); SetNoisyInt(&(rC->rc_routeType.rt_length),s,file);
} }
/* irCSetCost -- */ /* irCSetCost -- */
void void
irCSetCost(rC,s,file) irCSetCost(
RouteContact *rC; RouteContact *rC,
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(rC->rc_cost),s,file); SetNoisyInt(&(rC->rc_cost),s,file);
} }
@ -535,18 +535,18 @@ irCSetCost(rC,s,file)
/* irSrSetRate -- */ /* irSrSetRate -- */
void void
irSrSetRate(s,file) irSrSetRate(
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyDI(&irMazeParms->mp_wRate,s,file); SetNoisyDI(&irMazeParms->mp_wRate,s,file);
} }
/* irSrSetWidth -- */ /* irSrSetWidth -- */
void void
irSrSetWidth(s,file) irSrSetWidth(
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyDI(&(irMazeParms->mp_wWidth),s,file); SetNoisyDI(&(irMazeParms->mp_wWidth),s,file);
} }
@ -572,54 +572,54 @@ irSrSetWidth(s,file)
/* irWzdSetBloomCost -- */ /* irWzdSetBloomCost -- */
void void
irWzdSetBloomCost(s,file) irWzdSetBloomCost(
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyDI(&(irMazeParms->mp_bloomDeltaCost),s,file); SetNoisyDI(&(irMazeParms->mp_bloomDeltaCost),s,file);
} }
/* irWzdSetBloomLimit -- */ /* irWzdSetBloomLimit -- */
void void
irWzdSetBloomLimit(s,file) irWzdSetBloomLimit(
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyInt(&(irMazeParms->mp_bloomLimit),s,file); SetNoisyInt(&(irMazeParms->mp_bloomLimit),s,file);
} }
/* irWzdSetBoundsIncrement -- */ /* irWzdSetBoundsIncrement -- */
void void
irWzdSetBoundsIncrement(s,file) irWzdSetBoundsIncrement(
char *s; char *s,
FILE *file; FILE *file)
{ {
irSetNoisyAutoInt(&(irMazeParms->mp_boundsIncrement),s,file); irSetNoisyAutoInt(&(irMazeParms->mp_boundsIncrement),s,file);
} }
/* irWzdSetEstimate -- */ /* irWzdSetEstimate -- */
void void
irWzdSetEstimate(s,file) irWzdSetEstimate(
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyBool(&(irMazeParms->mp_estimate),s,file); SetNoisyBool(&(irMazeParms->mp_estimate),s,file);
} }
/* irWzdSetExpandEndpoints-- */ /* irWzdSetExpandEndpoints-- */
void void
irWzdSetExpandEndpoints(s, file) irWzdSetExpandEndpoints(
char *s; char *s,
FILE *file; FILE *file)
{ {
SetNoisyBool(&(irMazeParms->mp_expandEndpoints),s,file); SetNoisyBool(&(irMazeParms->mp_expandEndpoints),s,file);
} }
/* irWzdSetPenalty -- */ /* irWzdSetPenalty -- */
void void
irWzdSetPenalty(s, file) irWzdSetPenalty(
char *s; char *s,
FILE *file; FILE *file)
{ {
if(s) if(s)
{ {
@ -655,18 +655,18 @@ irWzdSetPenalty(s, file)
/* irWzdSetPenetration-- */ /* irWzdSetPenetration-- */
void void
irWzdSetPenetration(s, file) irWzdSetPenetration(
char *s; char *s,
FILE *file; FILE *file)
{ {
irSetNoisyAutoInt(&(irMazeParms->mp_maxWalkLength),s,file); irSetNoisyAutoInt(&(irMazeParms->mp_maxWalkLength),s,file);
} }
/* irWzdSetWindow -- */ /* irWzdSetWindow -- */
void void
irWzdSetWindow(s, file) irWzdSetWindow(
char *s; char *s,
FILE *file; FILE *file)
{ {
int which; int which;
int i, type; int i, type;
@ -800,9 +800,9 @@ static const struct
) )
void void
irContactsCmd(w, cmd) irContactsCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
TileType tileType; TileType tileType;
RouteContact *rC; RouteContact *rC;
@ -1069,9 +1069,9 @@ irContactsCmd(w, cmd)
/*ARGSUSED*/ /*ARGSUSED*/
void void
irHelpCmd(w, cmd) irHelpCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
int n; int n;
int which; int which;
@ -1174,9 +1174,9 @@ static const struct
/*ARGSUSED*/ /*ARGSUSED*/
void void
irLayersCmd(w, cmd) irLayersCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
TileType tileType; TileType tileType;
RouteLayer *rL; RouteLayer *rL;
@ -1459,9 +1459,9 @@ static const char* const rOptions[] = {
}; };
void void
irRouteCmd(w, cmd) irRouteCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
Point *startPtArg = NULL; /* pts to start point, if given on command */ Point *startPtArg = NULL; /* pts to start point, if given on command */
Rect *destRectArg = NULL; /* pts to dest rect, if given on command */ Rect *destRectArg = NULL; /* pts to dest rect, if given on command */
@ -1753,9 +1753,9 @@ static const struct
}; };
void void
irSearchCmd(w, cmd) irSearchCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
/* Process by case */ /* Process by case */
@ -1853,9 +1853,9 @@ irSearchCmd(w, cmd)
*/ */
void void
irSpacingsCmd(w, cmd) irSpacingsCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
TileType tileType; TileType tileType;
RouteType *rT; RouteType *rT;
@ -2132,9 +2132,9 @@ irSpacingsCmd(w, cmd)
*/ */
void void
irVerbosityCmd(w, cmd) irVerbosityCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
if(cmd->tx_argc >3) if(cmd->tx_argc >3)
{ {
@ -2197,9 +2197,9 @@ irVerbosityCmd(w, cmd)
*/ */
void void
irVersionCmd(w, cmd) irVersionCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
if(cmd->tx_argc == 2) if(cmd->tx_argc == 2)
@ -2250,9 +2250,9 @@ static const struct
}; };
void void
irWizardCmd(w, cmd) irWizardCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
/* Process by case */ /* Process by case */
@ -2353,9 +2353,9 @@ irWizardCmd(w, cmd)
*/ */
void void
irSaveParametersCmd(w, cmd) irSaveParametersCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
FILE *saveFile; FILE *saveFile;
RouteContact *rC; RouteContact *rC;
@ -2570,9 +2570,9 @@ iroute spacings CLEAR\n\
}, *subCmdP; }, *subCmdP;
void void
IRCommand(w, cmd) IRCommand(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
int n; int n;
int which; int which;

2
irouter/irInternal.h
View File

@ -48,7 +48,7 @@ extern RouteType *irFindRouteType();
extern RouteLayer *irFindRouteLayer(); extern RouteLayer *irFindRouteLayer();
extern RouteContact *irFindRouteContact(); extern RouteContact *irFindRouteContact();
extern char *irRepeatChar(); extern char *irRepeatChar(int n, char c);
/* ------------------------ Data Global to IRouter ------------------- */ /* ------------------------ Data Global to IRouter ------------------- */
extern MazeParameters *irMazeParms; extern MazeParameters *irMazeParms;

85
irouter/irRoute.c
View File

@ -92,17 +92,16 @@ typedef struct labelSearchData
*/ */
int int
irRoute(cmdWindow, startType, argStartPt, argStartLabel, argStartLayers, irRoute(
destType, argDestRect, argDestLabel, argDestLayers) MagWindow *cmdWindow, /* window route command issued to */
MagWindow *cmdWindow; /* window route command issued to */ int startType, /* how start is specified */
int startType; /* how start is specified */ Point *argStartPt, /* location to route from (in edit cell coords) */
Point *argStartPt; /* location to route from (in edit cell coords) */ char *argStartLabel, /* label to route from */
char *argStartLabel; /* label to route from */ List *argStartLayers, /* OK route layers to start route on */
List *argStartLayers; /* OK route layers to start route on */ int destType, /* how dest is specified */
int destType; /* how dest is specified */ Rect *argDestRect, /* location to route to (in edit cell coords) */
Rect *argDestRect; /* location to route to (in edit cell coords) */ char *argDestLabel, /* label to route to */
char *argDestLabel; /* label to route to */ List *argDestLayers) /* OK route layers to end route on */
List *argDestLayers; /* OK route layers to end route on */
{ {
CellUse *routeUse; /* Toplevel cell visible during routing */ CellUse *routeUse; /* Toplevel cell visible during routing */
int expansionMask; /* Subcell expansion modes to use during int expansionMask; /* Subcell expansion modes to use during
@ -497,13 +496,13 @@ abort:
*/ */
Point Point
irGetStartPoint(startType, argStartPt, argStartLabel, startLayerPtr, routeUse) irGetStartPoint(
int startType; /* how start is specified */ int startType, /* how start is specified */
Point *argStartPt; /* location to route from Point *argStartPt, /* location to route from
* (in edit cell coords) */ * (in edit cell coords) */
char *argStartLabel; /* label to route from */ char *argStartLabel, /* label to route from */
TileType *startLayerPtr; /* layer type (returned value) */ TileType *startLayerPtr, /* layer type (returned value) */
CellUse *routeUse; /* toplevel cell visible to router */ CellUse *routeUse) /* toplevel cell visible to router */
{ {
Point startPt; Point startPt;
@ -626,13 +625,13 @@ abort:
*/ */
Rect Rect
irGetDestRect(destType, argDestRect, argDestLabel, destLayerPtr, routeUse) irGetDestRect(
int destType; /* how dest is specified */ int destType, /* how dest is specified */
Rect *argDestRect; /* location to route to Rect *argDestRect, /* location to route to
* (in edit cell coords) */ * (in edit cell coords) */
char *argDestLabel; /* label to route to */ char *argDestLabel, /* label to route to */
TileType *destLayerPtr; /* layer type (returned value) */ TileType *destLayerPtr, /* layer type (returned value) */
CellUse *routeUse; /* toplevel cell visible to router */ CellUse *routeUse) /* toplevel cell visible to router */
{ {
Rect destRect; Rect destRect;
@ -754,11 +753,11 @@ abort:
*/ */
int int
irSelLabelsFunc(label, cellUse, transform, clientData) irSelLabelsFunc(
Label *label; Label *label,
CellUse *cellUse; CellUse *cellUse,
Transform *transform; Transform *transform,
ClientData clientData; ClientData clientData)
{ {
LabelSearchData *lsd = (LabelSearchData *)clientData; LabelSearchData *lsd = (LabelSearchData *)clientData;
CellDef *cellDef = cellUse->cu_def; CellDef *cellDef = cellUse->cu_def;
@ -804,11 +803,11 @@ irSelLabelsFunc(label, cellUse, transform, clientData)
*/ */
int int
irAllLabelsFunc(rect, name, label, clientData) irAllLabelsFunc(
Rect *rect; Rect *rect,
char *name; char *name,
Label *label; Label *label,
ClientData clientData; ClientData clientData)
{ {
LabelSearchData *lsd = (LabelSearchData *)clientData; LabelSearchData *lsd = (LabelSearchData *)clientData;
@ -849,10 +848,10 @@ irAllLabelsFunc(rect, name, label, clientData)
*/ */
int int
irSelectedTileFunc(rect, type, c) irSelectedTileFunc(
Rect *rect; Rect *rect,
TileType type; TileType type,
ClientData c; ClientData c)
{ {
RouteLayer *rL = (RouteLayer *) c; RouteLayer *rL = (RouteLayer *) c;
MZAddDest(rect, rL->rl_routeType.rt_tileType); MZAddDest(rect, rL->rl_routeType.rt_tileType);
@ -915,12 +914,12 @@ LayerInTouchingContact(
*/ */
List * List *
irChooseEndPtLayers(routeUse,expansionMask,endPt,argLayers,endPtName) irChooseEndPtLayers(
CellUse *routeUse; CellUse *routeUse,
int expansionMask; /* mask of expanded subcells */ int expansionMask, /* mask of expanded subcells */
Point *endPt; Point *endPt,
List *argLayers; List *argLayers,
char *endPtName; char *endPtName)
{ {
List *activeLayers; List *activeLayers;
List *presentLayers; List *presentLayers;

24
irouter/irTestCmd.c
View File

@ -77,9 +77,9 @@ extern const TestCmdTableE irTestCommands[];
*/ */
void void
irDebugTstCmd(w, cmd) irDebugTstCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
int result; int result;
bool value; bool value;
@ -130,9 +130,9 @@ irDebugTstCmd(w, cmd)
*/ */
void void
irHelpTstCmd(w, cmd) irHelpTstCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
int n; int n;
int which; int which;
@ -206,9 +206,9 @@ irHelpTstCmd(w, cmd)
*/ */
void void
irParmsTstCmd(w, cmd) irParmsTstCmd(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
MZPrintRLs(irRouteLayers); MZPrintRLs(irRouteLayers);
@ -265,9 +265,9 @@ const TestCmdTableE irTestCommands[] = {
*/ */
void void
IRTest(w, cmd) IRTest(
MagWindow *w; MagWindow *w,
TxCommand *cmd; TxCommand *cmd)
{ {
int n; int n;
int which; int which;

18
irouter/irUtils.c
View File

@ -50,8 +50,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
*/ */
RouteType * RouteType *
irFindRouteType(type) irFindRouteType(
TileType type; TileType type)
{ {
RouteType *rT; RouteType *rT;
@ -80,8 +80,8 @@ irFindRouteType(type)
*/ */
RouteLayer * RouteLayer *
irFindRouteLayer(type) irFindRouteLayer(
TileType type; TileType type)
{ {
RouteLayer *rL; RouteLayer *rL;
@ -110,8 +110,8 @@ irFindRouteLayer(type)
*/ */
RouteContact * RouteContact *
irFindRouteContact(type) irFindRouteContact(
TileType type; TileType type)
{ {
RouteContact *rC; RouteContact *rC;
@ -149,9 +149,9 @@ irFindRouteContact(type)
char RepeatString[100]; char RepeatString[100];
char * char *
irRepeatChar(n,c) irRepeatChar(
int n; int n,
char c; char c)
{ {
int i; int i;
for(i=0; i<n; i++) for(i=0; i<n; i++)