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

Lookup() constify call-site 

plow/PlowCmd.c: Lookup() constify call-site
plot/plotVers.c: Lookup() constify call-site
plot/plotMain.c: Lookup() constify call-site
plot/plotCmd.c: Lookup() constify call-site
netmenu/NMnetlist.c: Lookup() constify call-site
netmenu/NMcmdLZ.c: Lookup() constify call-site
netmenu/NMcmdAK.c: Lookup() constify call-site
lef/lefTech.c: Lookup() constify call-site
lef/lefCmd.c: Lookup() constify call-site
irouter/irRoute.c: Lookup() constify call-site
irouter/irCommand.c: Lookup() constify call-site
router/rtrCmd.c: Lookup() constify call-site
resis/ResRex.c: Lookup() constify call-site
gcr/gcrShwFlgs.c: Lookup() constify call-site
windows/windCmdSZ.c: Lookup() constify call-site
This commit is contained in:
Darryl L. Miles 2024-10-10 20:18:48 +01:00 committed by Tim Edwards
parent c2d533af3b
commit 3dbcb0759e
15 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcr/gcrShwFlgs.c
View File

@ -38,15 +38,15 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#define MAXFLAGS 17 #define MAXFLAGS 17
char * GCRFlagNames[]= const char * const GCRFlagNames[]=
{"blkb", "blkm", "blkp", "cc", "ce", "r", "tc", "te", "u", {"blkb", "blkm", "blkp", "cc", "ce", "r", "tc", "te", "u",
"v2", "vl", "vd", "vm", "vr", "vu", "x", "z", 0}; "v2", "vl", "vd", "vm", "vr", "vu", "x", "z", 0};
int GCRFlagValue[]= const int GCRFlagValue[]=
{ 3, 1, 2, 256, 1024, 8, 128, 512, 4, { 3, 1, 2, 256, 1024, 8, 128, 512, 4,
64, 32, 32768, 2048, 8192, 16384, 16, 4096}; 64, 32, 32768, 2048, 8192, 16384, 16, 4096};
char * GCRFlagDescr[]={ const char * const GCRFlagDescr[]={
"3 Both layers are blocked", "3 Both layers are blocked",
"1 Location is blocked with metal", "1 Location is blocked with metal",
"2 Location is blocked with poly", "2 Location is blocked with poly",

2
irouter/irCommand.c
View File

@ -1442,7 +1442,7 @@ irLayersCmd(w, cmd)
*/ */
/* Route options Table */ /* Route options Table */
static char* rOptions[] = { static const char* const rOptions[] = {
"-dbox", /* 0 */ "-dbox", /* 0 */
"-dlabel", /* 1 */ "-dlabel", /* 1 */
"-dlayers", /* 2 */ "-dlayers", /* 2 */

2
irouter/irRoute.c
View File

@ -927,7 +927,7 @@ irChooseEndPtLayers(routeUse,expansionMask,endPt,argLayers,endPtName)
List *presentContacts; List *presentContacts;
List *presentContactLayers; List *presentContactLayers;
static char *actionNames[] = { "no", "yes", 0 }; static const char * const actionNames[] = { "no", "yes", 0 };
List *l; List *l;
RouteLayer *rL; RouteLayer *rL;

7
lef/lefCmd.c
View File

@ -80,7 +80,8 @@ CmdLef(w, cmd)
TxCommand *cmd; TxCommand *cmd;
{ {
int option, i, cargs, units = 1000; /* Default nanometers */ int option, i, cargs, units = 1000; /* Default nanometers */
char **msg, *namep; const char * const *msg;
char *namep;
CellUse *selectedUse; CellUse *selectedUse;
CellDef *selectedDef; CellDef *selectedDef;
bool is_lef; bool is_lef;
@ -148,7 +149,7 @@ CmdLef(w, cmd)
* sensible interpretation was possible. * sensible interpretation was possible.
*/ */
static char *cmdLefOption[] = static const char * const cmdLefOption[] =
{ {
"read [filename] read a LEF file filename[.lef]\n" "read [filename] read a LEF file filename[.lef]\n"
" read [filename] -import read a LEF file; import cells from .mag files\n" " read [filename] -import read a LEF file; import cells from .mag files\n"
@ -167,7 +168,7 @@ CmdLef(w, cmd)
NULL NULL
}; };
static char *cmdDefOption[] = static const char * const cmdDefOption[] =
{ {
"read [filename] read a DEF file filename[.def]\n" "read [filename] read a DEF file filename[.def]\n"
" read [filename] -labels read a DEF file with net labeling\n" " read [filename] -labels read a DEF file with net labeling\n"

2
lef/lefTech.c
View File

@ -213,7 +213,7 @@ LefTechLine(sectionName, argc, argv)
TileTypeBitMask mmask; TileTypeBitMask mmask;
lefLayer *lefl, *newlefl; lefLayer *lefl, *newlefl;
int i, option; int i, option;
static char *keywords[] = { static const char * const keywords[] = {
"obstruction", "layer", "route", "routing", "masterslice", "obstruction", "layer", "route", "routing", "masterslice",
"cut", "contact", "overlap", "bound", "ignore", NULL "cut", "contact", "overlap", "bound", "ignore", NULL
}; };

2
netmenu/NMcmdAK.c
View File

@ -161,7 +161,7 @@ NMCmdCleanup(w, cmd)
{ {
char answer[30]; char answer[30];
int indx, defaultValue; int indx, defaultValue;
static char *options[] = {"abort", "dnet", "dterm", "skip", NULL}; static const char * const options[] = {"abort", "dnet", "dterm", "skip", NULL};
if (p->nmcl_problem == NMCL_ONETERM) if (p->nmcl_problem == NMCL_ONETERM)
{ {

2
netmenu/NMcmdLZ.c
View File

@ -235,7 +235,7 @@ NMCmdPushButton(w, cmd)
TxCommand *cmd; /* Contains the command's argc and argv. */ TxCommand *cmd; /* Contains the command's argc and argv. */
{ {
int button, action; int button, action;
static char *NMButton[] = {"left", "middle", "right", NULL}; static const char * const NMButton[] = {"left", "middle", "right", NULL};
if (cmd->tx_argc != 2) if (cmd->tx_argc != 2)
{ {

4
netmenu/NMnetlist.c
View File

@ -108,7 +108,7 @@ Netlist *nmListHead = NULL; /* The first netlist in the linked
/* Used in asking the user for confirmation: */ /* Used in asking the user for confirmation: */
static char *(yesno[]) = {"no", "yes", NULL}; static const char * const yesno[] = {"no", "yes", NULL};
/* /*
@ -881,7 +881,7 @@ void
NMWriteAll() NMWriteAll()
{ {
Netlist *nl, *saveCurrent; Netlist *nl, *saveCurrent;
static char *(options[]) = {"write", "skip", "abort", NULL}; static const char * const options[] = {"write", "skip", "abort", NULL};
char answer[10]; char answer[10];
int indx; int indx;

4
plot/plotCmd.c
View File

@ -91,7 +91,7 @@ CmdPlot(w, cmd)
TxCommand *cmd; TxCommand *cmd;
{ {
int option; int option;
char **msg; const char * const *msg;
MagWindow *window; MagWindow *window;
DBWclientRec *crec; DBWclientRec *crec;
TileTypeBitMask mask; TileTypeBitMask mask;
@ -105,7 +105,7 @@ CmdPlot(w, cmd)
extern void GrTCairoPlotSVG(); extern void GrTCairoPlotSVG();
#endif #endif
static char *cmdPlotOption[] = static const char * const cmdPlotOption[] =
{ {
"postscript file [layers] generate PostScript file for what's\n\ "postscript file [layers] generate PostScript file for what's\n\
underneath the box", underneath the box",

8
plot/plotMain.c
View File

@ -52,7 +52,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
/* remain in the following lists so that magic doesn't complain when */ /* remain in the following lists so that magic doesn't complain when */
/* encountering these styles in the technology file. */ /* encountering these styles in the technology file. */
static char *plotStyles[] = /* Names of tech subsections. */ static const char * const plotStyles[] = /* Names of tech subsections. */
{ {
"postscript", "postscript",
"pnm", "pnm",
@ -64,7 +64,7 @@ static char *plotStyles[] = /* Names of tech subsections. */
}; };
/* These names need to match the plot types enumerated in plotInt.h */ /* These names need to match the plot types enumerated in plotInt.h */
static char *plotTypeNames[] = static const char * const plotTypeNames[] =
{ {
"versatec_color", "versatec_color",
"versatec_bw", "versatec_bw",
@ -384,8 +384,8 @@ PlotSetParam(name, value)
char *value; /* New value for the parameter. */ char *value; /* New value for the parameter. */
{ {
int indx, i; int indx, i;
static char *tfNames[] = { "false", "true", 0 }; static const char * const tfNames[] = { "false", "true", 0 };
static char *paramNames[] = static const char * const paramNames[] =
{ {
"showcellnames", "showcellnames",
"ps_cellidfont", "ps_cellidfont",

2
plot/plotVers.c
View File

@ -1074,7 +1074,7 @@ PlotVersatec(scx, layers, xMask, user_scale)
*/ */
int user_scale; /* Scalefactor of output */ int user_scale; /* Scalefactor of output */
{ {
static char *yesNo[] = {"no", "yes", NULL}; static const char * const yesNo[] = {"no", "yes", NULL};
int dotsAcross, dotsDown, swathsDown, scaleDown; int dotsAcross, dotsDown, swathsDown, scaleDown;
int mag_width; /* lambda */ int mag_width; /* lambda */
float width; /* inches */ float width; /* inches */

5
plow/PlowCmd.c
View File

@ -87,14 +87,15 @@ CmdPlow(w, cmd)
{ {
int xdelta, ydelta, absX, absY; int xdelta, ydelta, absX, absY;
int option, dir, distance; int option, dir, distance;
char *layers, **msg; char *layers;
const char * const *msg;
TileTypeBitMask mask; TileTypeBitMask mask;
Rect rootBox, editBox, newBox; Rect rootBox, editBox, newBox;
CellDef *rootDef, *editDef; CellDef *rootDef, *editDef;
Point rootPoint; Point rootPoint;
MagWindow *window; MagWindow *window;
Transform t; Transform t;
static char *cmdPlowOption[] = static const char * const cmdPlowOption[] =
{ {
"boundary set boundary around area plowing may affect", "boundary set boundary around area plowing may affect",
"help print this help information", "help print this help information",

4
resis/ResRex.c
View File

@ -256,14 +256,14 @@ CmdExtResis(win, cmd)
extern int resSubcircuitFunc(); /* Forward declaration */ extern int resSubcircuitFunc(); /* Forward declaration */
static char *onOff[] = static const char * const onOff[] =
{ {
"off", "off",
"on", "on",
NULL NULL
}; };
static char *cmdExtresisCmd[] = static const char * const cmdExtresisCmd[] =
{ {
"all extract all the nets", "all extract all the nets",
"threshold [value] set minimum resistor extraction threshold", "threshold [value] set minimum resistor extraction threshold",

2
router/rtrCmd.c
View File

@ -505,7 +505,7 @@ CmdRoute(w, cmd)
NLNetList netList; NLNetList netList;
char *netListName; char *netListName;
static char *cmdRouteOption[] = static const char * const cmdRouteOption[] =
{ {
"*checks toggle column checking", "*checks toggle column checking",
"*debug toggle router trace messages", "*debug toggle router trace messages",

4
windows/windCmdSZ.c
View File

@ -990,8 +990,8 @@ windScrollBarsCmd(w, cmd)
TxCommand *cmd; TxCommand *cmd;
{ {
int place; int place;
static char *onoff[] = {"on", "off", 0}; static const char * const onoff[] = {"on", "off", 0};
static bool truth[] = {TRUE, FALSE}; static const bool truth[] = {TRUE, FALSE};
if (cmd->tx_argc != 2) goto usage; if (cmd->tx_argc != 2) goto usage;