K&R utils/** and const-correctness (part 1)

cif/CIFrdutils.c

@@ -1466,9 +1466,9 @@ cifParseComment()
  * ----------------------------------------------------------------------------
  */
 
-Transform *
+const Transform *
 CIFDirectionToTrans(point)
-    Point *point;		/* Direction vector from origin. */
+    const Point *point;		/* Direction vector from origin. */
 {
     if ((point->p_x != 0) && (point->p_y == 0))
     {

cif/CIFread.h

@@ -161,7 +161,7 @@ extern void CIFSkipToSemi(), CIFSkipSep(), CIFSkipBlanks();
 extern void CIFFreePath(), CIFCleanPath();
 extern void CIFReadCellInit(), CIFReadCellCleanup();
 extern LinkedRect *CIFPolyToRects();
-extern Transform *CIFDirectionToTrans();
+extern const Transform *CIFDirectionToTrans(const Point *point);
 extern int CIFReadNameToType();
 
 /* Variable argument procedures require complete prototype */

cmwind/CMWcmmnds.c

@@ -301,7 +301,7 @@ cmwPushbutton(w, cmd)
     TxCommand *cmd;
 {
     int button;
-    static char *cmwButton[] = {"left", "middle", "right", NULL};
+    static const char * const cmwButton[] = {"left", "middle", "right", NULL};
 
     if (cmd->tx_argc != 2)
     {

commands/CmdAB.c

@@ -134,7 +134,7 @@ CmdArray(w, cmd)
     MagWindow *w;
     TxCommand *cmd;
 {
-    static char *cmdArrayOption[] = {
+    static const char * const cmdArrayOption[] = {
 	"count 		[[xlo] xhi [ylo] yhi]	array subcells",
 	"width 		[value]			set or return array x-spacing",
 	"height 	[value]			set or return array y-spacing",
@@ -144,7 +144,7 @@ CmdArray(w, cmd)
 	NULL
     };
 
-    char **msg;
+    const char * const *msg;
     int option, locargc, argstart;
     bool doList = FALSE;
     ArrayInfo a;
@@ -597,7 +597,7 @@ CmdBox(w, cmd)
     MagWindow *w;
     TxCommand *cmd;
 {
-    static char *cmdBoxOption[] = {
+    static const char * const cmdBoxOption[] = {
 	"width		[value]			set or return box width",
 	"height		[value]			set or return box height",
 	"size		[width height]		set or return box size",
@@ -626,7 +626,7 @@ CmdBox(w, cmd)
     bool needBox = TRUE;		/* require that box be defined */
     bool refEdit = FALSE;		/* referenced to edit cell coordinates */
     bool cursorRef = FALSE;		/* reference position is the cursor */
-    char **msg;
+    const char * const *msg;
 
     argc = cmd->tx_argc;
     if (argc > 7) goto badusage;

commands/CmdCD.c

@@ -130,7 +130,8 @@ CmdCalma(w, cmd)
     TxCommand *cmd;
 {
     int option, ext, value;
-    char **msg, *namep, *dotptr;
+    const char * const *msg;
+    char *namep, *dotptr;
     char writeMode[3];
     CellDef *rootDef;
     FILETYPE f;
@@ -139,14 +140,14 @@ CmdCalma(w, cmd)
     gzFile fz;
 #endif
 
-    static char *gdsExts[] = {".gds", ".gds.gz", ".gds2", ".strm", "", NULL};
-    static char *cmdCalmaYesNo[] = {
+    static const char * const gdsExts[] = {".gds", ".gds.gz", ".gds2", ".strm", "", NULL};
+    static const char * const cmdCalmaYesNo[] = {
 		"no", "false", "off", "0", "yes", "true", "on", "1", 0 };
-    static char *cmdCalmaAllowDisallow[] = {"disallow", "0", "allow", "1", 0};
-    static char *cmdCalmaPolygonType[] = {"none", "temporary", "keep", 0};
-    static char *cmdCalmaWarnOptions[] = { "default", "none", "align",
+    static const char * const cmdCalmaAllowDisallow[] = {"disallow", "0", "allow", "1", 0};
+    static const char * const cmdCalmaPolygonType[] = {"none", "temporary", "keep", 0};
+    static const char * const cmdCalmaWarnOptions[] = { "default", "none", "align",
 		"limit", "redirect", "help", 0 };
-    static char *cmdCalmaOption[] =
+    static const char * const cmdCalmaOption[] =
     {
 	"help		print this help information",
 	"abstract [allow|disallow]\n"
@@ -1115,7 +1116,7 @@ CmdCellname(w, cmd)
     void (*func)();
     CellDef *newDef, *cellDef;
 
-    static char *cmdCellOption[] =
+    static const char * const cmdCellOption[] =
     {
 	"children 	list children of selected or named cell",
 	"parents 	list parents of selected or named cell",
@@ -1151,7 +1152,7 @@ CmdCellname(w, cmd)
 		   IDX_ORIENTATION, IDX_RENAME, IDX_READWRITE,
 		   IDX_MODIFIED } optionType;
 
-    static char *cmdCellnameYesNo[] = {
+    static const char * const cmdCellnameYesNo[] = {
 		"no", "false", "off", "0", "yes", "true", "on", "1", 0 };
 
     if (strstr(cmd->tx_argv[0], "in"))
@@ -1715,7 +1716,8 @@ CmdCif(w, cmd)
     TxCommand *cmd;
 {
     int option, yesno;
-    char **msg, *namep;
+    const char * const *msg;
+    char *namep;
     CellDef *rootDef, *paintDef;
     Rect box;
     TileType layer;
@@ -1730,11 +1732,11 @@ CmdCif(w, cmd)
     int argshift;
     char **argv = cmd->tx_argv;
 
-    static char *cmdCifWarnOptions[] = { "default", "none", "align",
+    static const char * const cmdCifWarnOptions[] = { "default", "none", "align",
 		"limit", "redirect", "help", 0 };
-    static char *cmdCifYesNo[] = { "no", "yes", 0 };
-    static char *cmdCifInOut[] = { "input", "output", 0 };
-    static char *cmdCifOption[] =
+    static const char * const cmdCifYesNo[] = { "no", "yes", 0 };
+    static const char * const cmdCifInOut[] = { "input", "output", 0 };
+    static const char * const cmdCifOption[] =
     {
 	"*array layer		display CIF layer under box (array only)",
 	"*hier layer		display CIF layer under box (hier only)",
@@ -3686,7 +3688,7 @@ CmdCrash(w, cmd)
 {
     int option = -1;
     char *filename = NULL;
-    static char *cmdCrashOpt[] = {"save", "recover", 0};
+    static const char * const cmdCrashOpt[] = {"save", "recover", 0};
 
     if (cmd->tx_argc > 3)
 	TxError("Usage: %s save|recover [filename]\n", cmd->tx_argv[0]);
@@ -3994,7 +3996,7 @@ CmdDrc(w, cmd)
     CellDef	* rootDef;
     Transform	  trans;
     MagWindow	* window;
-    char 	**msg;
+    const char 	* const *msg;
     bool	wizardHelp;
     bool	incremental;
     bool	doforall = FALSE;
@@ -4010,7 +4012,7 @@ CmdDrc(w, cmd)
     Tcl_Obj *lobj;
 #endif
 
-    static char *cmdDrcOption[] =
+    static const char * const cmdDrcOption[] =
     {
 	"*flatcheck             check box area by flattening",
 	"*halo [d]		limit error checking to areas of d units",
@@ -4819,7 +4821,8 @@ cmdDumpParseArgs(cmdName, w, cmd, dummy, scx)
     CellDef *def, *rootDef, *editDef;
     bool hasChild, hasRoot, hasTrans;
     Rect rootBox, bbox;
-    Transform *tx_cell, trans_cell;
+    const Transform *tx_cell;
+    Transform trans_cell;
     char **av;
     char *cellnameptr, *fullpathname;
     int ac, clen;
@@ -4961,10 +4964,10 @@ cmdDumpParseArgs(cmdName, w, cmd, dummy, scx)
     hasChild = hasRoot = hasTrans = FALSE;
     while (ac > 0)
     {
-	static char *kwdNames[] = { "child", "parent", "0", "90", "180", "270",
+	static const char * const kwdNames[] = { "child", "parent", "0", "90", "180", "270",
 					    "v", "0v", "90v", "180v", "270v",
 					    "h", "0h", "90h", "180h", "270h", 0 };
-	static char *refPointNames[] = { "ll", "lr", "ul", "ur", 0 };
+	static const char * const refPointNames[] = { "ll", "lr", "ul", "ur", 0 };
 	Label *lab;
 	int n,p;
 

commands/CmdE.c

@@ -311,14 +311,14 @@ CmdElement(w, cmd)
 {
 
     int option, type;
-    char **msg;
+    const char * const *msg;
     Rect area;
     int style;
     CellDef *def;
     CellUse *use;
     bool getopt;
 
-    static char *cmdElementOption[] = {
+    static const char * const cmdElementOption[] = {
 	"add			create a new element",
 	"delete		delete an existing element",
 	"configure		configure or query an existing element",
@@ -328,14 +328,14 @@ CmdElement(w, cmd)
 	NULL
     };
 
-    static char *cmdElementType[] = {
+    static const char * const cmdElementType[] = {
 	"line		name style x1 y1 x2 y2",
 	"rectangle		name style llx lly urx ury",
 	"text		name style cx cy label",
 	NULL
     };
 
-    static char *cmdConfigureType[] = {
+    static const char * const cmdConfigureType[] = {
 	"text		get (or) replace <string>",
 	"style		get (or) add <style> (or) remove <style>",
 	"position		get (or) <point> (or) <rect>",
@@ -945,7 +945,8 @@ CmdExtract(w, cmd)
     MagWindow *w;
     TxCommand *cmd;
 {
-    char **msg, *namep, *arg;
+    const char * const *msg;
+    char *namep, *arg;
     int option, warn, len, n, all;
     int dist;
     bool no;
@@ -957,15 +958,15 @@ CmdExtract(w, cmd)
     int argc = cmd->tx_argc;
     char **argv = cmd->tx_argv;
 
-    static char *cmdExtWarn[] =
+    static const char * const cmdExtWarn[] =
     {
 	"all			enable all warnings",
 	"dup			warn when different nodes have the same name",
 	"fets			warn about badly constructed fets",
 	"labels		warn when subcell nodes are unlabelled",
 	NULL
     };
-    static char *cmdExtOption[] =
+    static const char * const cmdExtOption[] =
     {
 	"adjust			compensate R and C hierarchically",
 	"all			all options",
@@ -978,7 +979,7 @@ CmdExtract(w, cmd)
 	"aliases		output all net name aliases",
 	NULL
     };
-    static char *cmdExtLength[] =
+    static const char * const cmdExtLength[] =
     {
 	"clear			clear the driver and receiver tables",
 	"driver termName(s)	identify a driving (output) terminal",
@@ -988,15 +989,15 @@ CmdExtract(w, cmd)
 
     /* These must match definitions EXT_UNIQ_* in extract/extract.h: */
 
-    static char *cmdExtUniq[] =
+    static const char * const cmdExtUniq[] =
     {
 	"all			extract matching labels as unique nodes",
 	"#			extract tagged labels as unique nodes",
 	"noports		ignore ports when making labels unique",
 	"notopports		ignore top-level ports when making labels unique",
 	NULL
     };
-    static char *cmdExtCmd[] =
+    static const char * const cmdExtCmd[] =
     {
 	"all			extract root cell and all its children",
 	"cell name		extract selected cell into file \"name\"",

commands/CmdFI.c

@@ -150,7 +150,7 @@ CmdFeedback(w, cmd)
     MagWindow *w;
     TxCommand *cmd;
 {
-    static char *cmdFeedbackOptions[] =
+    static const char * const cmdFeedbackOptions[] =
     {
 	"add text [style] [points...]	create new feedback area over box",
 	"clear [substring]		clear all or selected feedback info",
@@ -161,11 +161,11 @@ CmdFeedback(w, cmd)
 	"why				print all feedback messages under box",
 	NULL
     };
-    static char *cmdFeedbackStyleNames[] =
+    static const char * const cmdFeedbackStyleNames[] =
     {
 	"dotted", "medium", "outline", "pale", "solid", NULL
     };
-    static int cmdFeedbackStyles[] =
+    static const int cmdFeedbackStyles[] =
     {
 	STYLE_DOTTEDHIGHLIGHTS, STYLE_MEDIUMHIGHLIGHTS,
 	STYLE_OUTLINEHIGHLIGHTS, STYLE_PALEHIGHLIGHTS,
@@ -176,7 +176,8 @@ CmdFeedback(w, cmd)
 					 */
     int option, i, style, pstart;
     Rect box, r;
-    char *text, **msg;
+    char *text;
+    const char * const *msg;
     CellDef *rootDef;
     HashTable table;
     HashEntry *h;
@@ -1259,7 +1260,7 @@ CmdGrid(w, cmd)
     int xSpacing, ySpacing, xOrig, yOrig, multiple;
     DBWclientRec *crec;
     char *boxvalues;
-    static char *cmdGridOptions[] =
+    static const char * const cmdGridOptions[] =
     {
 	"box [values]	report the box representing the user grid",
 	"help		print this message",