From 30d40fb206c7a7f46b84438b58f47df1b2f820a0 Mon Sep 17 00:00:00 2001
From: Intubun <41478036+Intubun@users.noreply.github.com>
Date: Wed, 6 May 2026 10:43:34 +0200
Subject: [PATCH] Annotate ClientData callbacks: /*ARGSUSED*/ + /* UNUSED */
 markers

All functions that received a ClientData (or FindRegion *) parameter in
commit fc21472e solely to satisfy WASM call_indirect signature matching
are now annotated so static analysers and casual readers can see the
intent has been verified:

  /*ARGSUSED*/          before each such function definition
  /* UNUSED */          on each unused parameter in the definition
  /* UNUSED */          on matching forward declarations

Affected: calmaWriteInitFunc, cifWriteInitFunc, cmdWindSet,
dbStampFunc, dbwElementAlways1, dbwfbWindFunc, DBWHLRedrawWind,
spcnodeHierVisit, extSDTileFunc, extTransPerimFunc,
extAnnularTileFunc, extResistorTileFunc, extDefInitFunc,
extTimesInitFunc.
---
 calma/CalmaRead.c     |  2 +-
 calma/CalmaWrite.c    |  5 +++--
 calma/CalmaWriteZ.c   |  2 +-
 cif/CIFwrite.c        |  5 +++--
 commands/CmdSubrs.c   |  5 +++--
 database/DBtimestmp.c |  3 ++-
 dbwind/DBWelement.c   |  5 +++--
 dbwind/DBWfdback.c    |  5 +++--
 dbwind/DBWhlights.c   |  3 ++-
 ext2spice/ext2hier.c  |  3 ++-
 extract/ExtBasic.c    | 20 ++++++++++++--------
 extract/ExtMain.c     |  5 +++--
 extract/ExtTimes.c    |  3 ++-
 13 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/calma/CalmaRead.c b/calma/CalmaRead.c
index e0a4935f..52a3a828 100644
--- a/calma/CalmaRead.c
+++ b/calma/CalmaRead.c
@@ -112,7 +112,7 @@ bool CalmaUnique = FALSE;		/* If TRUE, then if a cell exists in
 extern bool CalmaDoLibrary;		/* Also used by GDS write */
 
 extern void calmaUnexpected(int wanted, int got);
-extern int calmaWriteInitFunc(CellDef *def, ClientData cdata);
+extern int calmaWriteInitFunc(CellDef *def, ClientData cdata);	/* UNUSED */
 
 /*
  * Scaling.
diff --git a/calma/CalmaWrite.c b/calma/CalmaWrite.c
index de718f63..045805f4 100644
--- a/calma/CalmaWrite.c
+++ b/calma/CalmaWrite.c
@@ -96,7 +96,7 @@ typedef struct {
 } calmaOutputStruct;
 
     /* Forward declarations */
-extern int calmaWriteInitFunc(CellDef *def, ClientData cdata);
+extern int calmaWriteInitFunc(CellDef *def, ClientData cdata);	/* UNUSED */
 extern int calmaWritePaintFunc(Tile *tile, TileType dinfo, calmaOutputStruct *cos);
 extern int calmaMergePaintFunc(Tile *tile, TileType dinfo, calmaOutputStruct *cos);
 extern int calmaWriteUseFunc(CellUse *use, FILE *f);
@@ -822,10 +822,11 @@ done:
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 calmaWriteInitFunc(
     CellDef *def,
-    ClientData cdata)
+    ClientData cdata)	/* UNUSED */
 {
     def->cd_client = (ClientData) 0;
     return (0);
diff --git a/calma/CalmaWriteZ.c b/calma/CalmaWriteZ.c
index 775416dd..c2e9bf86 100644
--- a/calma/CalmaWriteZ.c
+++ b/calma/CalmaWriteZ.c
@@ -96,7 +96,7 @@ extern int calmaPaintLayerNumber;
 extern int calmaPaintLayerType;
 
     /* External functions from CalmaWrite.c */
-extern int calmaWriteInitFunc(CellDef *def, ClientData cdata);
+extern int calmaWriteInitFunc(CellDef *def, ClientData cdata);	/* UNUSED */
 
 /* Structure used by calmaWritePaintFuncZ() and others */
 
diff --git a/cif/CIFwrite.c b/cif/CIFwrite.c
index 25ffa4bd..a7a39ae2 100644
--- a/cif/CIFwrite.c
+++ b/cif/CIFwrite.c
@@ -44,7 +44,7 @@ static const char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magi
 #include "textio/textio.h"
 
     /* Forward declarations */
-extern int cifWriteInitFunc(CellDef *def, ClientData cdata);
+extern int cifWriteInitFunc(CellDef *def, ClientData cdata);	/* UNUSED */
 extern int cifWriteMarkFunc(CellUse *use);
 extern int cifWritePaintFunc(Tile *tile, TileType dinfo, FILE *f);
 extern int cifWriteLabelFunc(Tile *tile, TileType dinfo, FILE *f);
@@ -204,10 +204,11 @@ CIFWrite(
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 cifWriteInitFunc(
     CellDef *def,
-    ClientData cdata)
+    ClientData cdata)	/* UNUSED */
 {
     def->cd_client = (ClientData) 0;
     return (0);
diff --git a/commands/CmdSubrs.c b/commands/CmdSubrs.c
index d5fc2dde..39ed51c0 100644
--- a/commands/CmdSubrs.c
+++ b/commands/CmdSubrs.c
@@ -1019,7 +1019,7 @@ CmdSetWindCaption(
 				 * edit cell was selected.
 				 */
 {
-    int cmdWindSet(MagWindow *window, ClientData clientData);
+    int cmdWindSet(MagWindow *window, ClientData clientData);	/* UNUSED */
 
     newEditDef = (newEditUse) ? newEditUse->cu_def : NULL;
     newRootDef = rootDef;
@@ -1053,10 +1053,11 @@ CmdSetWindCaption(
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 cmdWindSet(
     MagWindow *window,
-    ClientData clientData)
+    ClientData clientData)	/* UNUSED */
 {
     char caption[200];
     CellDef *wDef;
diff --git a/database/DBtimestmp.c b/database/DBtimestmp.c
index b38b2b09..954f286e 100644
--- a/database/DBtimestmp.c
+++ b/database/DBtimestmp.c
@@ -238,10 +238,11 @@ DBUpdateStamps(def)
     }
 }
 
+/*ARGSUSED*/
 int
 dbStampFunc(cellDef, cdata)
     CellDef *cellDef;
-    ClientData cdata;
+    ClientData cdata;	/* UNUSED */
 {
     CellUse *cu;
     CellDef *cd;
diff --git a/dbwind/DBWelement.c b/dbwind/DBWelement.c
index aae0a727..fee521a7 100644
--- a/dbwind/DBWelement.c
+++ b/dbwind/DBWelement.c
@@ -867,10 +867,11 @@ dbwelemGetTransform(use, transform, cdarg)
     return 1;
 }
 
+/*ARGSUSED*/
 int
 dbwElementAlways1(w, clientData)
-    MagWindow *w;		/* Unused. */
-    ClientData clientData;	/* Unused. */
+    MagWindow *w;		/* UNUSED */
+    ClientData clientData;	/* UNUSED */
 {
     return 1;
 }
diff --git a/dbwind/DBWfdback.c b/dbwind/DBWfdback.c
index 1d2300bb..74aa3ef3 100644
--- a/dbwind/DBWfdback.c
+++ b/dbwind/DBWfdback.c
@@ -531,10 +531,11 @@ dbwfbGetTransform(use, transform, cdarg)
  * cell.
  */
 
+/*ARGSUSED*/
 int
 dbwfbWindFunc(w, clientData)
-    MagWindow *w;		/* Unused. */
-    ClientData clientData;	/* Unused. */
+    MagWindow *w;		/* UNUSED */
+    ClientData clientData;	/* UNUSED */
 {
     return 1;
 }
diff --git a/dbwind/DBWhlights.c b/dbwind/DBWhlights.c
index 3975ea3f..a2b82016 100644
--- a/dbwind/DBWhlights.c
+++ b/dbwind/DBWhlights.c
@@ -357,10 +357,11 @@ DBWHLRedrawPrepWindow(MagWindow *window, Rect *area)
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 DBWHLRedrawWind(window, clientData)
     MagWindow *window;		/* Window in which to redraw highlights. */
-    ClientData clientData;	/* Unused. */
+    ClientData clientData;	/* UNUSED */
 {
     int i;
     DBWclientRec *crec;
diff --git a/ext2spice/ext2hier.c b/ext2spice/ext2hier.c
index a933b863..50185835 100644
--- a/ext2spice/ext2hier.c
+++ b/ext2spice/ext2hier.c
@@ -1563,13 +1563,14 @@ spcsubHierVisit(
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 spcnodeHierVisit(
     HierContext *hc,
     EFNode *node,
     int res,
     double cap,
-    ClientData cdata)
+    ClientData cdata)	/* UNUSED */
 {
     HierName *hierName;
     bool isConnected = FALSE;
diff --git a/extract/ExtBasic.c b/extract/ExtBasic.c
index 725eabab..2606af05 100644
--- a/extract/ExtBasic.c
+++ b/extract/ExtBasic.c
@@ -147,13 +147,13 @@ NodeRegion *temp_subsnode = NULL;	/* Last subsnode found */
 /* Forward declarations */
 void extOutputNodes();
 int extTransTileFunc();
-int extTransPerimFunc(Boundary *, ClientData);
+int extTransPerimFunc(Boundary *, ClientData);	/* UNUSED */
 int extTransFindSubs();
 int extTransFindId();
 void extTermAPFunc();
 
-int extAnnularTileFunc(Tile *, TileType, int, FindRegion *);
-int extResistorTileFunc(Tile *, TileType, int, FindRegion *);
+int extAnnularTileFunc(Tile *, TileType, int, FindRegion *);	/* UNUSED */
+int extResistorTileFunc(Tile *, TileType, int, FindRegion *);	/* UNUSED */
 int extSpecialPerimFunc();
 
 void extFindDuplicateLabels();
@@ -2185,12 +2185,13 @@ extDevFindParamMatch(devptr, length, width)
  *
  * ----------------------------------------------------------------------------
  */
+/*ARGSUSED*/
 int
 extSDTileFunc(tile, dinfo, pNum, arg)
     Tile *tile;
-    TileType dinfo;	/* (unused) */
+    TileType dinfo;	/* UNUSED */
     int pNum;
-    FindRegion *arg;
+    FindRegion *arg;	/* UNUSED */
 {
     LinkedTile *newdevtile;
 
@@ -3948,10 +3949,11 @@ extTermAPFunc(tile, dinfo,  eapd)
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 extTransPerimFunc(bp, cdata)
     Boundary *bp;
-    ClientData cdata;
+    ClientData cdata;	/* UNUSED */
 {
     TileType tinside, toutside, dinfo;
     Tile *tile;
@@ -4227,12 +4229,13 @@ extTransPerimFunc(bp, cdata)
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 extAnnularTileFunc(tile, dinfo, pNum, arg)
     Tile *tile;
     TileType dinfo;
     int pNum;
-    FindRegion *arg;
+    FindRegion *arg;	/* UNUSED */
 {
     TileTypeBitMask mask;
     TileType loctype;
@@ -4278,12 +4281,13 @@ extAnnularTileFunc(tile, dinfo, pNum, arg)
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 extResistorTileFunc(tile, dinfo, pNum, arg)
     Tile *tile;
     TileType dinfo;
     int pNum;
-    FindRegion *arg;
+    FindRegion *arg;	/* UNUSED */
 {
     TileTypeBitMask mask;
     TileType loctype;
diff --git a/extract/ExtMain.c b/extract/ExtMain.c
index 4beab80f..bdc594af 100644
--- a/extract/ExtMain.c
+++ b/extract/ExtMain.c
@@ -85,7 +85,7 @@ typedef struct _linkedDef {
 Stack *extDefStack;
 
     /* Forward declarations */
-int extDefInitFunc(CellDef *, ClientData);
+int extDefInitFunc(CellDef *, ClientData);	/* UNUSED */
 void extDefPush();
 void extDefIncremental();
 void extParents();
@@ -395,10 +395,11 @@ ExtAll(rootUse)
  * cell defs, in preparation for extracting a subtree
  * rooted at a particular def.
  */
+/*ARGSUSED*/
 int
 extDefInitFunc(def, cdata)
     CellDef *def;
-    ClientData cdata;
+    ClientData cdata;	/* UNUSED */
 {
     def->cd_client = (ClientData) 0;
     return (0);
diff --git a/extract/ExtTimes.c b/extract/ExtTimes.c
index ffec19c6..cf4fe4ac 100644
--- a/extract/ExtTimes.c
+++ b/extract/ExtTimes.c
@@ -288,10 +288,11 @@ ExtTimes(rootUse, f)
  * ----------------------------------------------------------------------------
  */
 
+/*ARGSUSED*/
 int
 extTimesInitFunc(use, cdata)
     CellUse *use;
-    ClientData cdata;
+    ClientData cdata;	/* UNUSED */
 {
     CellDef *def = use->cu_def;
     struct cellStats *cs;