From 4f54bcf4f48d4716e605cb015f2a7ecc38b7bde3 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Fri, 31 Jan 2025 19:00:47 +0000 Subject: [PATCH] K&R wiring/*.c: bulk function implementation conversion K&R obsolete syntax removal for C23 compatibility series --- wiring/wireOps.c | 46 +++++++++++++++++++++++----------------------- wiring/wireTech.c | 17 +++++++++-------- wiring/wireUndo.c | 12 ++++++------ 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/wiring/wireOps.c b/wiring/wireOps.c index a0d52642..7bb56ae2 100644 --- a/wiring/wireOps.c +++ b/wiring/wireOps.c @@ -75,8 +75,8 @@ static CellDef *wireDesiredDef; */ MagWindow * -wireFindRootWindow(rootDef) - CellDef *rootDef; /* Root definition for which a root use +wireFindRootWindow( + CellDef *rootDef) /* Root definition for which a root use * is desired. */ { @@ -96,9 +96,9 @@ wireFindRootWindow(rootDef) */ int -wireFindRootFunc(window, mwPtr) - MagWindow *window; /* A layout window. */ - MagWindow **mwPtr; /* Copy layout window pointer to this */ +wireFindRootFunc( + MagWindow *window, /* A layout window. */ + MagWindow **mwPtr) /* Copy layout window pointer to this */ { CellUse *use; @@ -128,15 +128,15 @@ wireFindRootFunc(window, mwPtr) */ void -WirePickType(type, ppoint, width) - TileType type; /* New type of material to use for wiring. +WirePickType( + TileType type, /* New type of material to use for wiring. * If less than zero, then pick a new type * based on what's underneath the cursor. */ - Point *ppoint; /* If non-NULL, contains a point position + Point *ppoint, /* If non-NULL, contains a point position * from which to get the wire type. */ - int width; /* Width to use for future wiring. If type + int width) /* Width to use for future wiring. If type * is less than zero then this parameter is * ignored and the width of the material * underneath the cursor is used. @@ -269,13 +269,13 @@ WirePickType(type, ppoint, width) */ int -WireGetWidth() +WireGetWidth(void) { return WireWidth; } TileType -WireGetType() +WireGetType(void) { return WireType; } @@ -299,16 +299,16 @@ WireGetType() */ void -WireAddLeg(rect, point, direction) - Rect *rect; /* Describes the current (last-painted) leg +WireAddLeg( + Rect *rect, /* Describes the current (last-painted) leg * of the wire, in root coordinates. If NULL, * then the box is used for this. */ - Point *point; /* Describes where to paint the wire to, in + Point *point, /* Describes where to paint the wire to, in * root coordinates. If NULL, then the cursor * location is used as the point. */ - int direction; /* Which direction to run the wire, in root + int direction) /* Which direction to run the wire, in root * coords. If WIRE_CHOOSE, then pick a * direction based on point. If WIRE_VERTICAL * or WIRE_HORIZONTAL, then run the wire in @@ -557,7 +557,7 @@ WireAddLeg(rect, point, direction) */ void -WireShowLeg() +WireShowLeg(void) { Rect current, new, leg, editArea, *rect = ¤t; CellDef *boxRootDef; @@ -731,12 +731,12 @@ WireShowLeg() #define WIRING_CONTACT_DOWN 0 void -WireAddContact(newType, newWidth) - TileType newType; /* New type of material to use for wiring. +WireAddContact( + TileType newType, /* New type of material to use for wiring. * If less than zero, pick a new type based * on what's underneath the cursor. */ - int newWidth; /* New width to use for future wiring. If + int newWidth) /* New width to use for future wiring. If * newType is less than zero, then this * parameter is ignored and the width of * the material underneath the cursor is @@ -1071,9 +1071,9 @@ WireAddContact(newType, newWidth) */ void -WireButtonProc(w, cmd) - MagWindow *w; /* Window in which button was pushed. */ - TxCommand *cmd; /* Describes exactly what happened. */ +WireButtonProc( + MagWindow *w, /* Window in which button was pushed. */ + TxCommand *cmd) /* Describes exactly what happened. */ { /* We do commands on the down-pushes and ignore the releases. */ @@ -1112,7 +1112,7 @@ WireButtonProc(w, cmd) */ void -WireInit() +WireInit(void) { static char *doc = "You are currently using the \"wiring\" tool. The button actions are:\n\ diff --git a/wiring/wireTech.c b/wiring/wireTech.c index 1b4b9e15..6c8ae105 100644 --- a/wiring/wireTech.c +++ b/wiring/wireTech.c @@ -56,7 +56,7 @@ int WireUnits; // Units per lambda for wiring sizes */ void -WireTechInit() +WireTechInit(void) { Contact *contact; int i; @@ -87,10 +87,10 @@ WireTechInit() /* ARGSUSED */ bool -WireTechLine(sectionName, argc, argv) - char *sectionName; /* Name of this section (unused). */ - int argc; /* Number of arguments on line. */ - char *argv[]; /* Pointers to fields of line. */ +WireTechLine( + char *sectionName, /* Name of this section (unused). */ + int argc, /* Number of arguments on line. */ + char *argv[]) /* Pointers to fields of line. */ { Contact *new; int hasExtend = 0; @@ -193,7 +193,7 @@ WireTechLine(sectionName, argc, argv) */ void -WireTechFinal() +WireTechFinal(void) { /* Debugging code to print info about layers: */ @@ -223,8 +223,9 @@ WireTechFinal() */ void -WireTechScale(scalen, scaled) - int scalen, scaled; +WireTechScale( + int scalen, + int scaled) { Contact *con; diff --git a/wiring/wireUndo.c b/wiring/wireUndo.c index f31c3c31..e2e2b615 100644 --- a/wiring/wireUndo.c +++ b/wiring/wireUndo.c @@ -80,7 +80,7 @@ static int wireOldDir = GEO_NORTH; /* Last direction */ */ void -WireUndoInit() +WireUndoInit(void) { extern void WireUndoForw(), WireUndoBack(); @@ -110,7 +110,7 @@ WireUndoInit() */ void -WireRememberForUndo() +WireRememberForUndo(void) { WireUndoEvent *wue; @@ -144,8 +144,8 @@ WireRememberForUndo() */ void -WireUndoForw(wue) - WireUndoEvent *wue; /* Event to be redone. */ +WireUndoForw( + WireUndoEvent *wue) /* Event to be redone. */ { WireType = wireOldType = wue->wue_newType; WireWidth = wireOldWidth = wue->wue_newWidth; @@ -153,8 +153,8 @@ WireUndoForw(wue) } void -WireUndoBack(wue) - WireUndoEvent *wue; /* Event to be undone. */ +WireUndoBack( + WireUndoEvent *wue) /* Event to be undone. */ { WireType = wireOldType = wue->wue_oldType; WireWidth = wireOldWidth = wue->wue_oldWidth;