mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-08-22 06:07:34 +02:00
LookupFull() constify call-site
lef/lefRead.c LookupFull() constify call-site lef/defRead.c LookupFull() constify call-site graphics/grDStyle.c: LookupFull() constify call-site
This commit is contained in:
committed by
Tim Edwards
parent
14b6453707
commit
a3dce62887
+1
-1
@@ -71,7 +71,7 @@ global int **GrStippleTable = NULL;
|
||||
global int grNumStipples = 0;
|
||||
|
||||
/* MUST be the same indices as the constants in graphicsInt.h */
|
||||
char *fillStyles[] = {
|
||||
const char * const fillStyles[] = {
|
||||
"solid",
|
||||
"cross",
|
||||
"outline",
|
||||
|
||||
+18
-18
@@ -106,7 +106,7 @@ DefAddRoutes(rootDef, f, oscale, special, netname, ruleset, defLayerMap, annotat
|
||||
lefRule *rule = NULL;
|
||||
int keyword;
|
||||
|
||||
static char *specnet_keys[] = {
|
||||
static const char * const specnet_keys[] = {
|
||||
"SHAPE",
|
||||
"STYLE",
|
||||
"USE",
|
||||
@@ -124,7 +124,7 @@ DefAddRoutes(rootDef, f, oscale, special, netname, ruleset, defLayerMap, annotat
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *specnet_shape_keys[] = {
|
||||
static const char * const specnet_shape_keys[] = {
|
||||
"RING",
|
||||
"PADRING",
|
||||
"BLOCKRING",
|
||||
@@ -800,13 +800,13 @@ DefReadNonDefaultRules(f, rootDef, sname, oscale, total)
|
||||
lefRule *rule = NULL;
|
||||
bool inlayer;
|
||||
|
||||
static char *nondef_keys[] = {
|
||||
static const char * const nondef_keys[] = {
|
||||
"-",
|
||||
"END",
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *nondef_property_keys[] = {
|
||||
static const char * const nondef_property_keys[] = {
|
||||
"HARDSPACING",
|
||||
"LAYER",
|
||||
"VIA",
|
||||
@@ -1060,13 +1060,13 @@ DefReadNets(f, rootDef, sname, oscale, special, dolabels, annotate, total)
|
||||
HashEntry *he;
|
||||
bool needanno;
|
||||
|
||||
static char *net_keys[] = {
|
||||
static const char * const net_keys[] = {
|
||||
"-",
|
||||
"END",
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *net_property_keys[] = {
|
||||
static const char * const net_property_keys[] = {
|
||||
"USE",
|
||||
"ROUTED",
|
||||
"NOSHIELD",
|
||||
@@ -1309,7 +1309,7 @@ DefReadLocation(use, f, oscale, tptr, noplace)
|
||||
float x, y;
|
||||
Transform t2;
|
||||
|
||||
static char *orientations[] = {
|
||||
static const char * const orientations[] = {
|
||||
"N", "S", "E", "W", "FN", "FS", "FE", "FW"
|
||||
};
|
||||
|
||||
@@ -1457,13 +1457,13 @@ DefReadPins(f, rootDef, sname, oscale, total, annotate)
|
||||
bool pending = FALSE;
|
||||
bool hasports = FALSE;
|
||||
|
||||
static char *pin_keys[] = {
|
||||
static const char * const pin_keys[] = {
|
||||
"-",
|
||||
"END",
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *pin_property_keys[] = {
|
||||
static const char * const pin_property_keys[] = {
|
||||
"NET",
|
||||
"DIRECTION",
|
||||
"LAYER",
|
||||
@@ -1475,7 +1475,7 @@ DefReadPins(f, rootDef, sname, oscale, total, annotate)
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *pin_classes[] = {
|
||||
static const char * const pin_classes[] = {
|
||||
"DEFAULT",
|
||||
"INPUT",
|
||||
"OUTPUT TRISTATE",
|
||||
@@ -1485,7 +1485,7 @@ DefReadPins(f, rootDef, sname, oscale, total, annotate)
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *pin_uses[] = {
|
||||
static const char * const pin_uses[] = {
|
||||
"DEFAULT",
|
||||
"SIGNAL",
|
||||
"POWER",
|
||||
@@ -1778,13 +1778,13 @@ DefReadBlockages(f, rootDef, sname, oscale, total)
|
||||
lefLayer *lefl;
|
||||
HashEntry *he;
|
||||
|
||||
static char *block_keys[] = {
|
||||
static const char * const block_keys[] = {
|
||||
"-",
|
||||
"END",
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *block_property_keys[] = {
|
||||
static const char * const block_property_keys[] = {
|
||||
"RECT",
|
||||
"LAYER",
|
||||
NULL
|
||||
@@ -1903,13 +1903,13 @@ DefReadVias(f, sname, oscale, total)
|
||||
int rows = 1, cols = 1;
|
||||
TileType tlayer, clayer, blayer;
|
||||
|
||||
static char *via_keys[] = {
|
||||
static const char * const via_keys[] = {
|
||||
"-",
|
||||
"END",
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *via_property_keys[] = {
|
||||
static const char * const via_property_keys[] = {
|
||||
"RECT",
|
||||
"VIARULE",
|
||||
"CUTSIZE",
|
||||
@@ -2179,13 +2179,13 @@ DefReadComponents(f, rootDef, sname, oscale, total)
|
||||
int keyword, subkey, values;
|
||||
int processed = 0;
|
||||
|
||||
static char *component_keys[] = {
|
||||
static const char * const component_keys[] = {
|
||||
"-",
|
||||
"END",
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *property_keys[] = {
|
||||
static const char * const property_keys[] = {
|
||||
"FIXED",
|
||||
"COVER",
|
||||
"PLACED",
|
||||
@@ -2398,7 +2398,7 @@ DefRead(inName, dolabels, annotate, noblockage)
|
||||
float oscale;
|
||||
Rect *dierect;
|
||||
|
||||
static char *sections[] = {
|
||||
static const char * const sections[] = {
|
||||
"VERSION",
|
||||
"NAMESCASESENSITIVE",
|
||||
"UNITS",
|
||||
|
||||
+17
-17
@@ -462,9 +462,9 @@ LefParseEndStatement(f, match)
|
||||
{
|
||||
char *token;
|
||||
int keyword, words;
|
||||
char *match_name[2];
|
||||
const char * match_name[2];
|
||||
|
||||
static char *end_section[] = {
|
||||
static const char * const end_section[] = {
|
||||
"END",
|
||||
"ENDEXT",
|
||||
NULL
|
||||
@@ -529,7 +529,7 @@ LefSkipSection(f, section)
|
||||
{
|
||||
char *token;
|
||||
int keyword, result;
|
||||
static char *end_section[] = {
|
||||
static const char * const end_section[] = {
|
||||
"END",
|
||||
"ENDEXT",
|
||||
NULL
|
||||
@@ -1203,7 +1203,7 @@ LefReadGeometry(lefMacro, f, oscale, do_list, is_imported)
|
||||
Rect *paintrect;
|
||||
const Rect *contact = NULL;
|
||||
|
||||
static char *geometry_keys[] = {
|
||||
static const char * const geometry_keys[] = {
|
||||
"LAYER",
|
||||
"WIDTH",
|
||||
"PATH",
|
||||
@@ -1526,7 +1526,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale, is_imported)
|
||||
Label *firstlab;
|
||||
bool firstport = TRUE;
|
||||
|
||||
static char *pin_keys[] = {
|
||||
static const char * const pin_keys[] = {
|
||||
"DIRECTION",
|
||||
"USE",
|
||||
"PORT",
|
||||
@@ -1545,7 +1545,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale, is_imported)
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *pin_classes[] = {
|
||||
static const char * const pin_classes[] = {
|
||||
"DEFAULT",
|
||||
"INPUT",
|
||||
"OUTPUT",
|
||||
@@ -1555,7 +1555,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale, is_imported)
|
||||
NULL
|
||||
};
|
||||
|
||||
static int lef_class_to_bitmask[] = {
|
||||
static const int lef_class_to_bitmask[] = {
|
||||
PORT_CLASS_DEFAULT,
|
||||
PORT_CLASS_INPUT,
|
||||
PORT_CLASS_OUTPUT,
|
||||
@@ -1564,7 +1564,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale, is_imported)
|
||||
PORT_CLASS_FEEDTHROUGH
|
||||
};
|
||||
|
||||
static char *pin_uses[] = {
|
||||
static const char * const pin_uses[] = {
|
||||
"DEFAULT",
|
||||
"SIGNAL",
|
||||
"ANALOG",
|
||||
@@ -1574,7 +1574,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale, is_imported)
|
||||
NULL
|
||||
};
|
||||
|
||||
static int lef_use_to_bitmask[] = {
|
||||
static const int lef_use_to_bitmask[] = {
|
||||
PORT_USE_DEFAULT,
|
||||
PORT_USE_SIGNAL,
|
||||
PORT_USE_ANALOG,
|
||||
@@ -1583,7 +1583,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale, is_imported)
|
||||
PORT_USE_CLOCK
|
||||
};
|
||||
|
||||
static char *pin_shapes[] = {
|
||||
static const char * const pin_shapes[] = {
|
||||
"DEFAULT",
|
||||
"ABUTMENT",
|
||||
"RING",
|
||||
@@ -1591,7 +1591,7 @@ LefReadPin(lefMacro, f, pinname, pinNum, oscale, is_imported)
|
||||
NULL
|
||||
};
|
||||
|
||||
static int lef_shape_to_bitmask[] = {
|
||||
static const int lef_shape_to_bitmask[] = {
|
||||
PORT_SHAPE_DEFAULT,
|
||||
PORT_SHAPE_ABUT,
|
||||
PORT_SHAPE_RING,
|
||||
@@ -1878,7 +1878,7 @@ LefReadNonDefaultRule(f, rname, oscale)
|
||||
int idx;
|
||||
bool inlayer, done;
|
||||
|
||||
static char *nondef_property_keys[] = {
|
||||
static const char * const nondef_property_keys[] = {
|
||||
"HARDSPACING",
|
||||
"LAYER",
|
||||
"END",
|
||||
@@ -2094,7 +2094,7 @@ LefReadMacro(f, mname, oscale, importForeign, doAnnotate, lefTimestamp)
|
||||
bool has_size, is_imported = FALSE, propfound;
|
||||
Rect lefBBox;
|
||||
|
||||
static char *macro_keys[] = {
|
||||
static const char * const macro_keys[] = {
|
||||
"CLASS",
|
||||
"SIZE",
|
||||
"ORIGIN",
|
||||
@@ -2659,7 +2659,7 @@ LefReadLayerSection(f, lname, mode, lefl)
|
||||
float fvalue, oscale;
|
||||
|
||||
/* These are defined in the order of CLASS_* in lefInt.h */
|
||||
static char *layer_type_keys[] = {
|
||||
static const char * const layer_type_keys[] = {
|
||||
"ROUTING",
|
||||
"CUT",
|
||||
"MASTERSLICE",
|
||||
@@ -2667,7 +2667,7 @@ LefReadLayerSection(f, lname, mode, lefl)
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *layer_keys[] = {
|
||||
static const char * const layer_keys[] = {
|
||||
"TYPE",
|
||||
"WIDTH",
|
||||
"MAXWIDTH",
|
||||
@@ -2704,7 +2704,7 @@ LefReadLayerSection(f, lname, mode, lefl)
|
||||
NULL
|
||||
};
|
||||
|
||||
static char *spacing_keys[] = {
|
||||
static const char * const spacing_keys[] = {
|
||||
"RANGE",
|
||||
";",
|
||||
NULL
|
||||
@@ -2898,7 +2898,7 @@ LefRead(inName, importForeign, doAnnotate, lefTimestamp)
|
||||
HashEntry *he;
|
||||
lefLayer *lefl;
|
||||
|
||||
static char *sections[] = {
|
||||
static const char * const sections[] = {
|
||||
"VERSION",
|
||||
"BUSBITCHARS",
|
||||
"DIVIDERCHAR",
|
||||
|
||||
Reference in New Issue
Block a user