luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-30 18:02:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unused-parameters/unused-variables warnings

Browse Source 
Added a ARG_UNUSED macro in utils/magic.h, which
produces a simple cast to void to silence the warnings.
The reasons this is used as opposed to an attribute is
that most compilers should support this.
Besides this, the macro can be easily searched for in
the future to potentially remove (where possible) the
unused parameters.
This commit is contained in:
Patrick Kurth
2025-10-10 22:12:19 +02:00
parent 27c423c2ed
commit ea03883829
183 changed files with 642 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bplane/bpBins.c
-3
View File
@@ -80,7 +80,6 @@ static BinArray *bpBinArrayNew(int dx, /* x diameter of bins */
{
BinArray *new;
Rect abbox;
int w, h, dimX, dimY, numBins;
int size;
@@ -262,7 +261,6 @@ bpBinArraySizeIt(Rect *bbox, /* bin array bbox */
int *numBinsp, /* return number of bins here */
int *countp) /* return number of elements here */
{
BinArray *ba;
int count;
double numBins; /* need double to avoid overflow on tentative calc. */
int h = GEO_HEIGHT(bbox);
@@ -590,7 +588,6 @@ BinArray *bpBinArrayBuild(Rect bbox,
/* sub-bin normal bins */
{
int dimX = ba->ba_dimX;
int i;
for(i=0;i<numBins;i++)
bplane/bpMain.c
-2
View File
@@ -113,8 +113,6 @@ void BPFree(BPlane *bp)
*/
void BPAdd(BPlane *bp, void *element)
{
int size;
int binDim;
Element * e = element;
Rect *r = &e->e_rect;
bplane/bpStat.c
-9
View File
@@ -85,14 +85,7 @@ unsigned int bpStatBA(BinArray *ba,
int *totUnbinned, /* ret tot num of e's not binned */
int *maxDepth) /* ret max bin array depth */
{
Rect *bbox = &ba->ba_bbox;
int dx = ba->ba_dx;
int dy = ba->ba_dy;
int numBins = ba->ba_numBins;
int dimX = ba->ba_dimX;
int dimY = numBins/dimX;
int w = GEO_WIDTH(bbox);
int h = GEO_HEIGHT(bbox);
/* initial statistics */
unsigned int mem = 0;
@@ -103,7 +96,6 @@ unsigned int bpStatBA(BinArray *ba,
int maxCount = 0;
int maxEff = 0;
int maxEffSub = 0;
int maxSubCount = 0;
int unbinned = 0;
int depth = 1;
int maxDepthSub = 0;
@@ -228,7 +220,6 @@ unsigned int BPStat(BPlane *bp,
int *maxDepth) /* ret max bin array depth */
{
BinArray *ba = bp->bp_rootNode;
int numBins;
unsigned int mem = 0;
int tot = 0;
int bins = 0;
bplane/bpUtils.c
-22
View File
@@ -53,25 +53,3 @@ int bpRectDim(Rect *r, bool xDir)
{
return xDir ? r->r_xtop - r->r_xbot : r->r_ytop - r->r_ybot;
}
/*
* ----------------------------------------------------------------------------
* bpBinIndices --
*
* compute bin indices corresponding to area.
*
* ----------------------------------------------------------------------------
*/
static __inline__ void
bpBinIndices(Rect area, /* area */
Rect binArea, /* lower left corner of bin system */
int indexBits,
int dim,
bool xDir, /* TRUE for x bin, FALSE for y bin */
int *min, /* results go here */
int *max)
{
int ref, coord;
int index;
}
calma/CalmaRdcl.c
+5 -8
View File
@@ -99,11 +99,10 @@ OFFTYPE
calmaSetPosition(
char *sname)
{
OFFTYPE originalPos = 0, currentPos = 0;
OFFTYPE originalPos = 0;
int nbytes, rtype;
char *strname = NULL;
int strRecSize = 0;
bool found = FALSE;
originalPos = FTELL(calmaInputFile);
@@ -302,10 +301,8 @@ calmaFlattenPolygonFunc(
CellUse *use,
CellDef *parent)
{
int i;
CellUse dummy;
SearchContext scx;
HashEntry *he;
if (use->cu_def == NULL || use->cu_def->cd_name == NULL) return 0;
if (strncmp(use->cu_def->cd_name, "polygon", 7)) return 0;
@@ -356,7 +353,6 @@ calmaParseStructure(
HashEntry *he;
int timestampval = 0;
int suffix;
int mfactor;
int locPolygonCount;
OFFTYPE filepos;
bool was_called = FALSE;
@@ -364,7 +360,6 @@ calmaParseStructure(
bool predefined;
bool do_flatten;
CellDef *def;
Label *lab;
locPolygonCount = CalmaPolygonCount;
@@ -753,6 +748,8 @@ calmaEnumFunc(
Tile *tile,
int *plane)
{
ARG_UNUSED(tile);
ARG_UNUSED(plane);
return 1;
}
@@ -1167,7 +1164,6 @@ calmaElementSref(
Plane **gdsplanes = (Plane **)def->cd_client;
GDSCopyRec gdsCopyRec;
int pNum;
bool hasUses;
// Mark cell as flattened (at least once)
def->cd_flags |= CDFLATTENED;
@@ -1281,6 +1277,8 @@ gdsHasUses(
CellUse *use,
ClientData clientdata)
{
ARG_UNUSED(use);
ARG_UNUSED(clientdata);
return 1;
}
@@ -1291,7 +1289,6 @@ gdsCopyPaintFunc(
Tile *tile,
GDSCopyRec *gdsCopyRec)
{
int pNum;
TileType dinfo;
Rect sourceRect, targetRect;
Transform *trans = gdsCopyRec->trans;
calma/CalmaRdio.c
+1
View File
@@ -77,6 +77,7 @@ calmaReadTransform(
Transform *ptrans, /* Fill in this transform */
char *name) /* Name of subcell (for errors) */
{
ARG_UNUSED(name);
int nbytes, rtype, flags, angle;
double dangle;
double dmag;
calma/CalmaRdpt.c
+1 -5
View File
@@ -300,7 +300,6 @@ calmaElementBoundary(void)
if (rp != NULL)
{
Rect rpc;
int savescale;
/* Convert rp to magic database units to compare to label rects */
rpc = rp->r_r;
@@ -507,11 +506,8 @@ calmaElementPath(void)
{
int nbytes = -1, rtype = 0, extend1, extend2;
int layer, dt, width, pathtype, ciftype, savescale;
int xmin, ymin, xmax, ymax, temp;
CIFPath *pathheadp, *pathp, *previousp;
Rect segment;
CIFPath *pathheadp, *pathp;
Plane *plane;
int first,last;
CellUse *use;
CellDef *savedef = NULL, *newdef = NULL;
calma/CalmaWrite.c
+7 -13
View File
@@ -286,7 +286,7 @@ CalmaWrite(
CellDef *rootDef, /* Pointer to CellDef to be written */
FILE *f) /* Open output file */
{
int oldCount = DBWFeedbackCount, problems, nerr;
int oldCount = DBWFeedbackCount, problems;
bool good;
CellDef *err_def;
CellUse dummy;
@@ -686,8 +686,8 @@ calmaFullDump(
char *filename)
{
int version, rval;
char *libname = NULL, *testlib, uniqlibname[4];
char *sptr, *viewopts;
char *libname = NULL, uniqlibname[4];
char *viewopts;
bool isAbstract;
HashTable calmaDefHash;
HashSearch hs;
@@ -977,7 +977,6 @@ calmaProcessDef(
size_t defsize, numbytes;
off_t cellstart, cellend, structstart;
dlong cval;
int namelen;
FILETYPE fi;
/* Give some feedback to the user */
@@ -1901,10 +1900,9 @@ calmaWriteContacts(
{
TileType type;
TileTypeBitMask tMask, *rMask;
CellDef *def, *cellDef;
CellDef *def;
Rect area, cliprect;
int halfwidth, halfsize;
CIFOp *op;
/* Turn off generation of contact arrays for the duration of this */
/* subroutine, so that the contact definitions themselves will get */
@@ -2344,9 +2342,8 @@ calmaProcessBoundary(
calmaOutputStruct *cos)
{
FILE *f = cos->f;
LinkedBoundary *listtop, *lbref, *lbstop, *lbfree;
LinkedBoundary *listtop, *lbref, *lbstop;
BoundaryTop *bounds;
int sval;
int chkcount; /* diagnostic */
for (bounds = blist; bounds != NULL; bounds = bounds->bt_next)
@@ -2456,8 +2453,6 @@ calmaMergePaintFunc(
Tile *tile, /* Tile to be written out. */
calmaOutputStruct *cos) /* Information needed by algorithm */
{
FILE *f = cos->f;
const Rect *clipArea = cos->area;
Tile *t, *tp;
TileType ttype;
int i, llx, lly, urx, ury, intedges, num_points, split_type;
@@ -2781,7 +2776,7 @@ calmaWritePaintFunc(
{
FILE *f = cos->f;
const Rect *clipArea = cos->area;
Rect r, r2;
Rect r;
TiToRect(tile, &r);
if (clipArea != NULL)
@@ -3057,9 +3052,8 @@ calmaPaintLabelFunc(
{
FILE *f = cos->f;
const Rect *clipArea = cos->area;
Rect r, r2;
Rect r;
Point p;
int len;
CIFLayer *layer = CIFCurStyle->cs_layers[cos->type];
if (IsSplit(tile)) return 0; /* Ignore non-Manhattan geometry */
calma/CalmaWriteZ.c
+6 -15
View File
@@ -666,16 +666,13 @@ calmaFullDumpZ(
char *filename)
{
int version, rval;
char *libname = NULL, *testlib, uniqlibname[4];
char *sptr, *viewopts;
char *libname = NULL, uniqlibname[4];
char *viewopts;
bool isAbstract;
HashTable calmaDefHash;
HashSearch hs;
HashEntry *he, *he2;
static const int hdrSkip[] = { CALMA_FORMAT, CALMA_MASK, CALMA_ENDMASKS,
CALMA_REFLIBS, CALMA_FONTS, CALMA_ATTRTABLE,
CALMA_STYPTABLE, CALMA_GENERATIONS, -1 };
static const int skipBeforeLib[] = { CALMA_LIBDIRSIZE, CALMA_SRFNAME,
CALMA_LIBSECUR, -1 };
@@ -932,7 +929,6 @@ calmaProcessDefZ(
size_t defsize, numbytes;
z_off_t cellstart, cellend, structstart;
dlong cval;
int namelen;
gzFile fi;
/* Use PaOpen() so the paths searched are the same as were */
@@ -1726,10 +1722,9 @@ calmaWriteContactsZ(
{
TileType type;
TileTypeBitMask tMask, *rMask;
CellDef *def, *cellDef;
CellDef *def;
Rect area, cliprect;
int halfwidth, halfsize;
CIFOp *op;
/* Turn off generation of contact arrays for the duration of this */
/* subroutine, so that the contact definitions themselves will get */
@@ -1809,9 +1804,8 @@ calmaProcessBoundaryZ(
calmaOutputStructZ *cos)
{
gzFile f = cos->f;
LinkedBoundary *listtop, *lbref, *lbstop, *lbfree;
LinkedBoundary *listtop, *lbref, *lbstop;
BoundaryTop *bounds;
int sval;
int chkcount; /* diagnostic */
for (bounds = blist; bounds != NULL; bounds = bounds->bt_next)
@@ -1891,8 +1885,6 @@ calmaMergePaintFuncZ(
Tile *tile, /* Tile to be written out. */
calmaOutputStructZ *cos) /* Information needed by algorithm */
{
gzFile f = cos->f;
const Rect *clipArea = cos->area;
Tile *t, *tp;
TileType ttype;
int i, llx, lly, urx, ury, intedges, num_points, split_type;
@@ -2216,7 +2208,7 @@ calmaWritePaintFuncZ(
{
gzFile f = cos->f;
const Rect *clipArea = cos->area;
Rect r, r2;
Rect r;
TiToRect(tile, &r);
if (clipArea != NULL)
@@ -2492,9 +2484,8 @@ calmaPaintLabelFuncZ(
{
gzFile f = cos->f;
const Rect *clipArea = cos->area;
Rect r, r2;
Rect r;
Point p;
int len;
CIFLayer *layer = CIFCurStyle->cs_layers[cos->type];
if (IsSplit(tile)) return 0; /* Ignore non-Manhattan geometry */
cif/CIFgen.c
+18 -27
View File
@@ -139,6 +139,8 @@ cifInteractFunc(
Tile *tile,
ClientData clientdata) /* Unused */
{
ARG_UNUSED(tile);
ARG_UNUSED(clientdata);
return 1;
}
@@ -326,7 +328,7 @@ cifGrowMinFunc(
{
Rect area, parea;
int locDist, width, height, h;
TileType type, tptype;
TileType tptype;
Tile *tp, *tp2;
bool changed;
@@ -500,10 +502,9 @@ cifGrowGridFunc(
PaintResultType *table) /* Table to be used for painting. */
{
Rect area;
int remainder;
/* To be done---handle non-Manhattan geometry */
TileType oldType = TiGetType(tile);
TiGetType(tile);
TiToRect(tile, &area);
@@ -613,7 +614,6 @@ cifGrowEuclideanFunc(
int growDistanceX, growDistanceY;
int height, width;
double frac, ratio;
int limit;
if (oldType & TT_SIDE)
growDirs &= ~GROW_WEST;
@@ -1244,6 +1244,7 @@ cifProcessResetFunc(
Tile *tile,
ClientData clientData) /* unused */
{
ARG_UNUSED(clientData);
TiSetClient(tile, CIF_UNPROCESSED);
return 0;
}
@@ -1344,7 +1345,7 @@ cifBloatAllFunc(
Tile *t, *tp, *firstTile = NULL;
TileType type, ttype;
BloatData *bloats;
int i, locScale;
int locScale;
PlaneMask pmask;
CIFOp *op;
CellDef *def;
@@ -1423,7 +1424,6 @@ cifBloatAllFunc(
}
if (pmask == 0)
{
Rect foundArea;
if (bloats->bl_plane < 0) /* Bloat types are CIF types */
{
@@ -1905,7 +1905,6 @@ cifBridgeFunc2(
Rect area;
Tile *tp1, *tp2, *tpx;
int width = brs->bridge->br_width;
int wtest;
int spacing = growDistance;
BridgeCheckStruct brcs;
int cifBridgeCheckFunc(Tile *tile, BridgeCheckStruct *brcs); /* Forward reference */
@@ -2124,7 +2123,7 @@ cifCloseFunc(
Tile *tile,
Plane *plane)
{
Rect area, newarea;
ARG_UNUSED(plane);
int atotal;
int cifGatherFunc(Tile *tile, int *atotal, int mode);
@@ -2162,9 +2161,8 @@ cifGatherFunc(
int mode)
{
Tile *tp;
TileType type;
dlong locarea;
Rect area, newarea;
Rect area;
ClientData cdata = (mode == CLOSE_SEARCH) ? CIF_UNPROCESSED :
CD2INT(CIF_PENDING);
@@ -2312,6 +2310,7 @@ cifSquaresInitFunc(tile, clientData)
Tile *tile;
ClientData clientData;
{
ARG_UNUSED(clientData);
if (TiGetClient(tile) == CIF_UNPROCESSED)
return 1;
else
@@ -2464,6 +2463,7 @@ cifUnconnectFunc(
Tile *tile,
ClientData clientData) /* unused */
{
ARG_UNUSED(clientData);
TileType t = TiGetTypeExact(tile);
if (t == TT_SPACE) return 1;
else if (t & TT_DIAGONAL) return 1;
@@ -2495,10 +2495,9 @@ cifRectBoundingBox(
CellDef *cellDef,
Plane *plane)
{
ARG_UNUSED(cellDef);
Tile *tile = NULL, *t, *tp;
Rect bbox, area, *maxr;
int i, j, savecount;
TileType type;
bool simple;
static Stack *BoxStack = (Stack *)NULL;
@@ -2654,11 +2653,11 @@ cifSquaresFillArea(
CellDef *cellDef,
Plane *plane)
{
ARG_UNUSED(cellDef);
Tile *tile, *t, *tp;
Rect bbox, area, square, cut, llcut;
int nAcross, nUp, left, pitch, size, diff, right;
int nAcross, nUp, pitch, size, diff;
int i, j, k, savecount;
TileType type;
SquaresData *squares = (SquaresData *)op->co_client;
StripsData stripsData;
linkedStrip *stripList;
@@ -2983,13 +2982,13 @@ cifSlotsFillArea(
CellDef *cellDef,
Plane *plane)
{
ARG_UNUSED(cellDef);
Tile *tile, *t, *tp;
Rect bbox, area, square, cut, llcut;
int nAcross, nUp, left, spitch, lpitch, ssize, lsize, offset;
int diff, right;
int nAcross, nUp, spitch, lpitch, ssize, lsize, offset;
int diff;
int xpitch, ypitch, xborder, yborder, xdiff, ydiff;
int i, j, k, savecount;
TileType type;
SlotsData *slots = (SlotsData *)op->co_client;
StripsData stripsData;
linkedStrip *stripList;
@@ -3544,7 +3543,7 @@ cifContactFunc(
CIFSquaresInfo *csi) /* Describes how to generate squares. */
{
Rect area;
int i, nAcross, j, nUp, left, bottom, pitch, halfsize;
int nAcross, nUp, left, bottom, pitch, halfsize;
bool result;
SquaresData *squares = csi->csi_squares;
@@ -3625,7 +3624,7 @@ cifSlotFunc(
Rect *cut, /* initial (lower left) cut area */
bool vertical) /* if TRUE, slot is aligned vertically */
{
int i, j, xpitch, ypitch, delta, limit;
int xpitch, ypitch, delta, limit;
int *axtop, *axbot, *aytop, *aybot;
int *sxtop, *sxbot, *sytop, *sybot;
int *rows, *columns;
@@ -3972,7 +3971,6 @@ cifSrTiles(
{
TileTypeBitMask maskBits;
TileType t;
Tile *tp;
int i;
BloatData *bloats;
@@ -4056,7 +4054,6 @@ cifSrTiles2(
TileTypeBitMask maskBits;
Rect r;
TileType t;
Tile *tp;
int i;
/* When reading data from a cell, it must first be scaled to
@@ -4212,7 +4209,6 @@ cifBridgeLimFunc0(
Tile *tile,
BridgeLimStruct *brlims)
{
Plane *plane = brlims->plane;
Rect area, parea;
int minDistance = brlims->bridge->br_width;
int width, height, ybot0, tp2lim;
@@ -4573,7 +4569,6 @@ cifBridgeLimFunc2(
Tile *tp1, *tp2, *tpx;
int width = brlims->bridge->br_width;
int thirdOption;
int spacing = growDistance;
BridgeLimCheckStruct brlimcs;
brlimcs.sqdistance = (long) width * width;
@@ -4701,8 +4696,6 @@ cifInteractingRegions(
{
Tile *tile = NULL, *t, *tp;
Rect area;
int i;
TileType type;
bool interacts;
static Stack *RegStack = (Stack *)NULL;
@@ -4888,7 +4881,6 @@ CIFGenLayer(
Plane *temp;
static Plane *nextPlane, *curPlane;
Rect bbox;
CIFOp *tempOp;
CIFSquaresInfo csi;
SearchContext scx;
TileType ttype;
@@ -4896,7 +4888,6 @@ CIFGenLayer(
BloatStruct bls;
BridgeStruct brs;
BridgeLimStruct brlims;
BridgeData *bridge;
BloatData *bloats;
bool hstop = FALSE;
char *propvalue;
cif/CIFhier.c
+2
View File
@@ -1011,6 +1011,8 @@ cifHierElementFunc(
* CIF-generated.
*/
{
ARG_UNUSED(x);
ARG_UNUSED(y);
Rect defArea;
Transform tinv;
SearchContext scx;
cif/CIFmain.c
+1 -1
View File
@@ -259,7 +259,7 @@ CIFSetStyle(
* print out the valid styles.
*/
{
CIFKeep *style, *match, *exactmatch;
CIFKeep *style, *match;
bool ambiguous = FALSE;
int length;
cif/CIFrdcl.c
+3 -6
View File
@@ -260,8 +260,7 @@ cifFindCell(
int cifNum) /* The CIF number of the desired cell. */
{
HashEntry *h;
CellDef *def, *testdef;
int reused;
CellDef *def;
h = HashFind(&CifCellTable, (char *)(spointertype)cifNum);
@@ -507,6 +506,8 @@ int cifCheckPaintFunc(
Tile *tile,
ClientData clientData)
{
ARG_UNUSED(tile);
ARG_UNUSED(clientData);
return 1;
}
@@ -517,7 +518,6 @@ cifCopyPaintFunc(
Tile *tile,
CIFCopyRec *cifCopyRec)
{
int pNum;
TileType dinfo;
Rect sourceRect, targetRect;
Transform *trans = cifCopyRec->trans;
@@ -563,7 +563,6 @@ cifMaskHintFunc(
Tile *tile,
LinkedRect **lrecp)
{
Rect r;
LinkedRect *newlr;
newlr = (LinkedRect *)mallocMagic(sizeof(LinkedRect));
@@ -638,7 +637,6 @@ CIFPaintCurrent(
int pNum;
Plane *newplane;
Plane **parray;
extern char *(cifReadLayers[MAXCIFRLAYERS]);
/* NOTE: The condition cd_client == 0 when CDFLATGDS
* indicates that the cell was already in memory when the
@@ -1620,7 +1618,6 @@ CIFReadCellCleanup(
HashEntry *h;
HashSearch hs;
CellDef *def;
MagWindow *window;
int flags;
if (cifSubcellBeingRead)
cif/CIFrdpt.c
+2 -4
View File
@@ -327,7 +327,7 @@ CIFPaintWirePath(
CIFPath *pathp, *previousp, *nextp, *polypath;
CIFPath *returnpath, *newpath, *savepath;
LinkedRect *rectp;
double theta, phi, alpha, delta, cwidth, adjwidth, testmitre, savetheta;
double theta, phi, alpha, delta, cwidth, testmitre, savetheta;
double xmaxoff, ymaxoff, xminoff, yminoff;
double xmin, ymin, xmax, ymax, xnext, ynext;
bool firstpoint;
@@ -495,9 +495,7 @@ CIFPaintWirePath(
}
else
{
Rect r;
double a1, a2, r2, d1;
Point newpt;
/* Check if either of the two new segments travels opposite */
/* to theta. If so, then we need to find the intersection */
@@ -666,7 +664,7 @@ bool
CIFParseWire(void)
{
int width;
CIFPath *pathheadp, *polypath;
CIFPath *pathheadp;
int savescale;
/* Take the 'W'. */
cif/CIFrdtech.c
+1
View File
@@ -466,6 +466,7 @@ CIFReadTechLine(
int argc, /* Number of fields on line. */
char *argv[]) /* Values of fields. */
{
ARG_UNUSED(sectionName);
CIFOp *newOp = NULL;
CIFReadKeep *newStyle, *p;
HashEntry *he;
cif/CIFrdutils.c
+2 -4
View File
@@ -210,7 +210,7 @@ CIFScaleCoord(
int snap_type) /* How to deal with fractional results */
{
int result, scale, remain, denom;
int mult, mfactor;
int mult;
/* If internal grid subdivision is disallowed, always round to the */
/* nearest grid unit. */
@@ -1056,8 +1056,6 @@ CIFMakeManhattanPath(
PaintUndoInfo *ui)
{
CIFPath *new, *new2, *next, *path;
int xinit, xdiff, xincr, xlast, x;
int yinit, ydiff, yincr, ylast, y;
bool clockwise;
CIFPath *first, *last;
@@ -1239,7 +1237,7 @@ void
CIFCleanPath(
CIFPath *pathHead)
{
CIFPath *next, *path, *prev, *last;
CIFPath *next, *path, *prev;
int dir1, dir2;
if (!pathHead) return;
cif/CIFsee.c
-1
View File
@@ -142,7 +142,6 @@ CIFPaintLayer(
CellDef *paintDef) /* CellDef to paint into (may be NULL) */
{
int oldCount, i;
char msg[100];
SearchContext scx;
PaintLayerData pld;
TileTypeBitMask mask, depend;
cif/CIFtech.c
+2 -2
View File
@@ -234,7 +234,7 @@ cifParseLayers(
*/
{
TileTypeBitMask curCifMask, curPaintMask;
char curLayer[40], *p, *cp;
char curLayer[40], *p;
TileType paintType;
int i;
bool allResidues;
@@ -533,6 +533,7 @@ CIFTechLine(
int argc, /* Number of fields on line. */
char *argv[]) /* Values of fields. */
{
ARG_UNUSED(sectionName);
TileTypeBitMask mask, tempMask, cifMask, bloatLayers;
int i, j, l, distance;
CIFLayer *newLayer;
@@ -2572,7 +2573,6 @@ CIFTechOutputScale(
if (op->co_client)
{
int nlayers;
switch (op->co_opcode)
{
case CIFOP_SLOTS:
cif/CIFwrite.c
-2
View File
@@ -308,7 +308,6 @@ cifOut(
FILE *outf)
{
CellDef *def;
bool needHier;
while (!StackEmpty(cifStack))
{
@@ -728,7 +727,6 @@ CIFWriteFlat(
{
bool good;
int oldCount = DBWFeedbackCount;
TileTypeBitMask cifMask;
SearchContext scx;
cifStack = StackNew(1);
cmwind/CMWcmmnds.c
+2
View File
@@ -455,6 +455,7 @@ cmwSave(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
bool ok;
if ((cmd->tx_argc != 1) && (cmd->tx_argc != 4))
{
@@ -500,6 +501,7 @@ cmwLoad(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
if ((cmd->tx_argc != 1) && (cmd->tx_argc != 4))
{
TxError("Usage: %s [techStyle displayStyle monitorType]\n",
cmwind/CMWmain.c
+1
View File
@@ -223,6 +223,7 @@ CMWreposition(
Rect *newScreenArea,
bool final)
{
ARG_UNUSED(newScreenArea);
if (final)
WindMove(window, &colorWindowRect);
}
commands/CmdAB.c
+4 -22
View File
@@ -74,6 +74,7 @@ CmdAddPath(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
if (cmd->tx_argc != 2) {
TxError("Usage: %s appended_search_path\n", cmd->tx_argv[0]);
return;
@@ -111,6 +112,7 @@ CmdArchive(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int option = -1;
char *filename = NULL;
static const char * const cmdArchiveOpt[] = {"write", "writeall",
@@ -198,6 +200,7 @@ CmdArray(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
static const char * const cmdArrayOption[] = {
"count [[xlo] xhi [ylo] yhi] array subcells",
"width [value] set or return array x-spacing",
@@ -214,7 +217,6 @@ CmdArray(
ArrayInfo a;
Rect toolRect;
LinkedArray *lahead = NULL, *la;
int xval, yval;
#ifdef MAGIC_WRAPPER
Tcl_Obj *tobj;
@@ -364,11 +366,6 @@ CmdArray(
}
if ((locargc != 3) || (!StrIsInt(cmd->tx_argv[argstart + 1])))
goto badusage;
xval = atoi(cmd->tx_argv[argstart + 1]);
yval = atoi(cmd->tx_argv[argstart + 2]);
TxPrintf("Unimplemented function.\n");
break;
case ARRAY_HEIGHT:
@@ -400,11 +397,6 @@ CmdArray(
}
if ((locargc != 3) || (!StrIsInt(cmd->tx_argv[argstart + 1])))
goto badusage;
xval = atoi(cmd->tx_argv[argstart + 1]);
yval = atoi(cmd->tx_argv[argstart + 2]);
TxPrintf("Unimplemented function.\n");
break;
case ARRAY_PITCH:
@@ -440,11 +432,6 @@ CmdArray(
if ((locargc != 4) || (!StrIsInt(cmd->tx_argv[argstart + 1])) ||
(!StrIsInt(cmd->tx_argv[argstart + 2])))
goto badusage;
xval = atoi(cmd->tx_argv[argstart + 1]);
yval = atoi(cmd->tx_argv[argstart + 2]);
TxPrintf("Unimplemented function.\n");
break;
case ARRAY_POSITION:
@@ -481,11 +468,6 @@ CmdArray(
if ((locargc != 4) || (!StrIsInt(cmd->tx_argv[argstart + 1])) ||
(!StrIsInt(cmd->tx_argv[argstart + 2])))
goto badusage;
xval = atoi(cmd->tx_argv[argstart + 1]);
yval = atoi(cmd->tx_argv[argstart + 2]);
TxPrintf("Unimplemented function.\n");
break;
case ARRAY_DEFAULT:
@@ -529,7 +511,6 @@ badusage:
break;
}
freelist:
la = lahead;
while (la != NULL)
{
@@ -550,6 +531,7 @@ selGetArrayFunc(
Transform *trans,
LinkedArray **arg)
{
ARG_UNUSED(selUse);
/* Check "use" for array information and pass this to arrayInfo */
LinkedArray *la;
commands/CmdCD.c
+15 -12
View File
@@ -1146,13 +1146,13 @@ CmdCellname(
"modified true if modified, false if not",
NULL
};
typedef enum { IDX_CHILDREN, IDX_PARENTS, IDX_EXISTS, IDX_SELF,
enum optionType { IDX_CHILDREN, IDX_PARENTS, IDX_EXISTS, IDX_SELF,
IDX_INSTANCE, IDX_CHILDINST, IDX_CELLDEF, IDX_ALLCELLS,
IDX_TOPCELLS, IDX_IN_WINDOW, IDX_CREATE, IDX_DELETE,
IDX_DEREFERENCE, IDX_FILEPATH, IDX_FLAGS, IDX_TIMESTAMP,
IDX_LOCK, IDX_UNLOCK, IDX_PROPERTY, IDX_ABUTMENT,
IDX_ORIENTATION, IDX_RENAME, IDX_READWRITE,
IDX_MODIFIED } optionType;
IDX_MODIFIED };
static const char * const cmdCellnameYesNo[] = {
"no", "false", "off", "0", "yes", "true", "on", "1", 0 };
@@ -1736,7 +1736,6 @@ CmdCif(
bool doforall = FALSE;
float curscale;
int argc = cmd->tx_argc;
int argshift;
char **argv = cmd->tx_argv;
static const char * const cmdCifWarnOptions[] = { "default", "none", "align",
@@ -2276,6 +2275,7 @@ CmdClockwise(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
Transform trans, t2;
int degrees, locargc;
Rect rootBox, bbox;
@@ -2574,7 +2574,6 @@ cmdContactEraseFunc(
LinkedRect **lr)
{
LinkedRect *newlr;
Rect area;
newlr = (LinkedRect *)mallocMagic(sizeof(LinkedRect));
@@ -3694,6 +3693,7 @@ CmdCrash(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int option = -1;
char *filename = NULL;
static const char * const cmdCrashOpt[] = {"save", "recover", 0};
@@ -3797,6 +3797,7 @@ CmdDelete(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
if (cmd->tx_argc != 1) goto badusage;
if (!ToolGetEditBox((Rect *)NULL)) return;
@@ -3928,6 +3929,7 @@ cmdDownEnumFunc(
* area, in root coords.
*/
{
ARG_UNUSED(selUse);
Rect defArea, useArea;
/* Save this use as the default next edit cell, regardless of whether
@@ -3999,9 +4001,8 @@ CmdDrc(
static int drc_nth = 1;
int option, result, radius;
Rect rootArea, area;
CellUse * rootUse, *use;
CellUse * rootUse;
CellDef * rootDef;
Transform trans;
MagWindow * window;
const char * const *msg;
bool wizardHelp;
@@ -4565,7 +4566,6 @@ cmdDropPaintCell(
{
CellDef *cellDef = cxp->tc_scx->scx_use->cu_def;
TileTypeBitMask *lMask = (TileTypeBitMask *)cxp->tc_filter->tf_arg;
int pNum;
TileType type;
Rect area;
@@ -4573,7 +4573,7 @@ cmdDropPaintCell(
type = SplitRightType(tile);
else
type = SplitLeftType(tile);
pNum = DBPlane(type);
(void) type; // FIXME: this silences the set-but-unused warning, but type is apparently not used at all.
TiToRect(tile, &area);
@@ -4641,6 +4641,7 @@ cmdDropPaintFunc(
TileType type, /* Type of this piece of paint. */
TileTypeBitMask *mask) /* Place to OR in type's bit. */
{
ARG_UNUSED(rect);
if (type & TT_DIAGONAL)
type = (type & TT_SIDE) ? (type & TT_RIGHTMASK) >> 14 :
(type & TT_LEFTMASK);
@@ -4992,18 +4993,18 @@ cmdDumpParseArgs(
"0", "90", "180", "270",
"v", "0v", "90v", "180v", "270v",
"h", "0h", "90h", "180h", "270h", 0 };
typedef enum {
enum optionType {
IDX_CHILD, IDX_PARENT,
IDX_ZERO, IDX_90, IDX_180, IDX_270,
IDX_VERT, IDX_ZERO_VERT, IDX_90_VERT, IDX_180_VERT, IDX_270_VERT,
IDX_HORZ, IDX_ZERO_HORZ, IDX_90_HORZ, IDX_180_HORZ, IDX_270_HORZ
} optionType;
};
static const char * const refPointNames[] = {
"ll", "lr", "ul", "ur", "label", 0 };
typedef enum {
enum refPointType {
IDX_LL, IDX_LR, IDX_UL, IDX_UR, IDX_LABEL
} refPointType;
};
Label *lab;
int n, p;
@@ -5374,6 +5375,8 @@ cmdDumpFunc(
Label *label, /* Pointer to label (not used). */
Point *point) /* Place to store label's lower-left. */
{
ARG_UNUSED(name);
ARG_UNUSED(label);
*point = rect->r_ll;
return 1;
}
commands/CmdE.c
+2 -4
View File
@@ -88,7 +88,6 @@ CmdEdit(
CellDef *csave;
int cmdEditRedisplayFunc(MagWindow *w, Rect *area); /* Forward declaration. */
int cmdEditEnumFunc(CellUse *selUse, CellUse *use, Transform *transform, Rect *area); /* Forward declaration. */
bool noCurrentUse = FALSE;
if ((w != NULL) && (cmd->tx_argc == 2))
{
@@ -236,6 +235,7 @@ cmdEditEnumFunc(
* area, in root coords.
*/
{
ARG_UNUSED(selUse);
Rect defArea, useArea;
int xhi, xlo, yhi, ylo;
@@ -547,7 +547,6 @@ CmdElement(
DBWElementPos(w, cmd->tx_argv[2], &crect);
else
{
badrect:
TxError("Usage: element configure <name> position "
"<x> <y> [<x2> <y2>]\n");
return;
@@ -585,7 +584,6 @@ badrect:
DBWElementInbox(&area);
break;
case ELEMENT_HELP:
badusage:
for (msg = &(cmdElementOption[0]); *msg != NULL; msg++)
{
TxPrintf(" %s\n", *msg);
@@ -763,6 +761,7 @@ cmdEraseCellsFunc(
SearchContext *scx, /* Indicates cell found. */
ClientData cdarg) /* Not used. */
{
ARG_UNUSED(cdarg);
/* All this procedure does is to remember cells that are
* found, up to MAXCELLS of them.
*/
@@ -954,7 +953,6 @@ CmdExtract(
CellDef *selectedDef;
bool dolist = FALSE;
bool doforall = FALSE;
bool doLocal = FALSE;
int argc = cmd->tx_argc;
char **argv = cmd->tx_argv;
commands/CmdFI.c
+8 -3
View File
@@ -759,6 +759,8 @@ cmdFindLabelFunc(
Label *label,
LabSearchRec *cdarg)
{
ARG_UNUSED(name);
ARG_UNUSED(label);
if (cdarg->lsr_occur == 0)
{
cdarg->lsr_rect = *rect;
@@ -897,6 +899,8 @@ dbListLabels(
TerminalPath *tpath, /* Full pathname of terminal */
ClientData cdarg) /* (unused) */
{
ARG_UNUSED(scx);
ARG_UNUSED(cdarg);
char *n = tpath->tp_next;
char c = *n;
strcpy(n, label->lab_text);
@@ -1515,6 +1519,7 @@ CmdIdentify(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
extern int cmdIdFunc(CellUse *selUse, CellUse *use, Transform *transform, char *newId); /* Forward reference. */
if (cmd->tx_argc != 2)
@@ -1548,6 +1553,7 @@ cmdIdFunc(
Transform *transform, /* Not used. */
char *newId) /* New id for cell use. */
{
ARG_UNUSED(transform);
if (EditCellUse == NULL)
{
TxError("Top-level cell is not editable---cannot change identifier"
@@ -1969,7 +1975,7 @@ CmdFlatten(
TxCommand *cmd)
{
int i, xMask, optargs;
bool dolabels, dobox, toplabels, invert, doports, doinplace;
bool dolabels, dobox, toplabels, invert, doinplace;
char *destname;
CellDef *newdef;
CellUse *newuse;
@@ -1981,7 +1987,6 @@ CmdFlatten(
dolabels = TRUE;
toplabels = FALSE;
dobox = FALSE;
doports = TRUE;
doinplace = FALSE;
optargs = cmd->tx_argc - 1;
@@ -2020,7 +2025,7 @@ CmdFlatten(
if (!strncmp(cmd->tx_argv[i] + 3, "prop", 4))
xMask = (invert) ? CU_DESCEND_ALL : CU_DESCEND_PROP_FLAT;
else
doports = (invert) ? FALSE : TRUE;
{;} // doports = (invert) ? FALSE : TRUE;
break;
case 's':
xMask = (invert) ? CU_DESCEND_NO_SUBCKT : CU_DESCEND_ALL;
commands/CmdLQ.c
+9 -4
View File
@@ -189,7 +189,6 @@ CmdLabel(
TileType type = (TileType)(-1);
int pos = -1, font = -1, size = 0, rotate = 0, offx = 0, offy = 0;
bool sticky = FALSE;
int option;
char *p;
if (cmd->tx_argc < 2 || cmd->tx_argc > 9)
@@ -554,6 +553,8 @@ keepGoing(
CellUse *use,
ClientData clientdata)
{
ARG_UNUSED(use);
ARG_UNUSED(clientdata);
return 0; /* keep the search going */
}
@@ -598,6 +599,7 @@ CmdLocking(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int option;
static const char * const cmdLockingYesNo[] = { "disable", "no", "false", "off", "0",
@@ -1089,6 +1091,7 @@ CmdPath(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
char **pathptr;
char *srcptr;
int option;
@@ -1289,6 +1292,7 @@ cmdPortLabelFunc1(
TerminalPath *tpath,
ClientData cdata)
{
ARG_UNUSED(tpath);
Label **rlab = (Label **)cdata;
if (GEO_SURROUND(&scx->scx_area, &label->lab_rect))
@@ -1311,6 +1315,7 @@ cmdPortLabelFunc2(
TerminalPath *tpath,
ClientData cdata)
{
ARG_UNUSED(tpath);
Label **rlab = (Label **)cdata;
if (GEO_OVERLAP(&scx->scx_area, &label->lab_rect))
@@ -1526,7 +1531,6 @@ CmdPort(
int argstart;
int i, refidx, idx, pos, type, option, argc;
unsigned int dirmask;
bool found;
bool nonEdit = FALSE, doQuiet = FALSE;
Label *lab, *sl;
Rect editBox, tmpArea;
@@ -2425,6 +2429,7 @@ printPropertiesFunc(
ClientData value,
ClientData cdata) /* not used */
{
ARG_UNUSED(cdata);
#ifdef MAGIC_WRAPPER
char *keyvalue;
@@ -2479,8 +2484,6 @@ CmdNetlist(
{
int option;
const char * const *msg;
char *lastargv;
Point cursor;
static const char * const cmdNetlistOption[] =
{
"help print this help information",
@@ -2561,6 +2564,8 @@ CmdOrient(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
ARG_UNUSED(cmd);
Transform trans, t2;
int orientidx, locargc;
char *orientstr;
commands/CmdRS.c
+16 -4
View File
@@ -90,6 +90,7 @@ CmdRandom(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int value;
if (cmd->tx_argc == 1)
@@ -266,6 +267,7 @@ CmdScaleGrid(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int scalen, scaled;
char *argsep;
Rect rootBox;
@@ -422,6 +424,7 @@ CmdSee(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int flags;
bool off;
char *arg;
@@ -844,7 +847,7 @@ CmdSelect(
CellUse *use;
CellDef *rootBoxDef;
Transform trans, rootTrans, tmp1;
Point p, rootPoint, atPoint;
Point p, atPoint;
Rect r, selarea;
ExtRectList *rlist;
int option;
@@ -969,7 +972,6 @@ CmdSelect(
option = SEL_DEFAULT;
else
{
char *fileName;
option = Lookup(optionArgs[0], cmdSelectOption);
if ((option < 0) && (primargs != 2))
@@ -1707,6 +1709,7 @@ cmdLabelTextFunc(
Transform *transform,
char *text)
{
ARG_UNUSED(transform);
Label *newlab;
CellDef *cellDef = cellUse->cu_def;
#ifdef MAGIC_WRAPPER
@@ -1747,11 +1750,11 @@ cmdLabelRotateFunc(
Transform *transform,
int *value)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
#ifdef MAGIC_WRAPPER
Tcl_Obj *lobj;
#endif
Rect selarea;
if (value == NULL)
{
@@ -1784,6 +1787,7 @@ cmdLabelSizeFunc(
Transform *transform,
int *value)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
#ifdef MAGIC_WRAPPER
Tcl_Obj *lobj;
@@ -1820,6 +1824,7 @@ cmdLabelJustFunc(
Transform *transform,
int *value)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
#ifdef MAGIC_WRAPPER
Tcl_Obj *lobj;
@@ -1856,6 +1861,7 @@ cmdLabelLayerFunc(
Transform *transform,
int *value)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
TileType ttype;
#ifdef MAGIC_WRAPPER
@@ -1894,6 +1900,7 @@ cmdLabelStickyFunc(
Transform *transform,
int *value)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
int newvalue;
#ifdef MAGIC_WRAPPER
@@ -1935,6 +1942,7 @@ cmdLabelOffsetFunc(
Transform *transform,
Point *point)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
#ifdef MAGIC_WRAPPER
Tcl_Obj *lobj, *pobj;
@@ -1976,6 +1984,7 @@ cmdLabelRectFunc(
Transform *transform,
Rect *rect)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
#ifdef MAGIC_WRAPPER
Tcl_Obj *lobj, *pobj;
@@ -2022,6 +2031,7 @@ cmdLabelFontFunc(
Transform *transform,
int *font)
{
ARG_UNUSED(transform);
CellDef *cellDef = cellUse->cu_def;
#ifdef MAGIC_WRAPPER
Tcl_Obj *lobj;
@@ -2590,6 +2600,7 @@ CmdSideways(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
Transform trans;
Rect rootBox, bbox;
CellDef *rootDef;
@@ -2652,6 +2663,7 @@ CmdShell(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int i, cmdlength;
char *command;
@@ -2869,10 +2881,10 @@ CmdSnap(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
static const char * const names[] = { "off", "internal", "lambda", "grid", "user", "on",
"list", 0 };
int n = SNAP_LIST;
DBWclientRec *crec;
if (cmd->tx_argc < 2) goto printit;
commands/CmdSubrs.c
+1
View File
@@ -1190,6 +1190,7 @@ cmdGetSelFunc(
Transform *transform, /* Transform from coords of realUse to root. */
CellUse **pResult) /* Store realUse here. */
{
ARG_UNUSED(selUse);
*pResult = realUse;
if (cmdSelTrans != NULL)
*cmdSelTrans = *transform;
commands/CmdTZ.c
+15 -2
View File
@@ -63,6 +63,7 @@ int
existFunc(
Tile *tile)
{
ARG_UNUSED(tile);
return 1;
}
@@ -85,7 +86,7 @@ checkForPaintFunc(
ClientData arg)
{
int numPlanes = *((int *)arg);
int pNum, result;
int pNum;
if (cellDef->cd_flags & CDINTERNAL) return 0;
@@ -167,6 +168,7 @@ CmdTech(
MagWindow *w, /* Window in which command was invoked. */
TxCommand *cmd) /* Info about command options. */
{
ARG_UNUSED(w);
int option, action, i, locargc;
const char * const *msg;
#ifdef MAGIC_WRAPPER
@@ -657,6 +659,7 @@ CmdTool(
MagWindow *w, /* Window in which command was invoked. */
TxCommand *cmd) /* Info about command options. */
{
ARG_UNUSED(w);
if (cmd->tx_argc == 1)
{
(void) DBWChangeButtonHandler((char *) NULL);
@@ -777,6 +780,7 @@ CmdUpsidedown(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
Transform trans;
Rect rootBox, bbox;
CellDef *rootDef;
@@ -842,6 +846,7 @@ cmdWhatPrintCell(
Tile *tile,
TreeContext *cxp)
{
ARG_UNUSED(tile);
struct linked_id **lid = (struct linked_id **)cxp->tc_filter->tf_arg;
struct linked_id *curlid = *lid;
char *CurrCellName;
@@ -1217,6 +1222,7 @@ cmdWhatPaintFunc(
TileType type, /* Type of this piece of paint. */
TileTypeBitMask *mask) /* Place to OR in type's bit. */
{
ARG_UNUSED(rect);
if (type & TT_DIAGONAL)
type = (type & TT_SIDE) ? (type & TT_RIGHTMASK) >> 14 :
(type & TT_LEFTMASK);
@@ -1238,6 +1244,8 @@ cmdWhatLabelPreFunc(
* label found.
*/
{
ARG_UNUSED(transform);
ARG_UNUSED(foundAny);
LabelStore *newPtr;
CellDef *cellDef = cellUse->cu_def; /* Cell definition containing label. */
@@ -1358,6 +1366,8 @@ cmdWhatCellFunc(
* use found.
*/
{
ARG_UNUSED(selUse);
ARG_UNUSED(transform);
/* Forward reference */
char *dbGetUseName(CellUse *celluse);
@@ -1382,6 +1392,8 @@ cmdWhatCellListFunc(
Transform *transform, /* Not used. */
Tcl_Obj *newobj) /* Tcl list object holding use names */
{
ARG_UNUSED(selUse);
ARG_UNUSED(transform);
Tcl_Obj *tuple;
/* Forward reference */
char *dbGetUseName(CellUse *celluse);
@@ -1942,6 +1954,7 @@ CmdWriteall(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int cmdWriteallFunc(CellDef *def, TxCommand *cmd);
int option = -1;
static const char * const writeallOpts[] = { "force", "modified", 0 };
@@ -2007,7 +2020,7 @@ cmdWriteallFunc(
* argc is a list of cells to write.
*/
{
char *prompt, *argv;
char *prompt;
int i, action, cidx = 0;
static const char * const actionNames[] =
{ "write", "flush", "skip", "abort", "autowrite", 0 };
commands/CmdWizard.c
+6
View File
@@ -83,6 +83,7 @@ CmdCoord(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(cmd);
MagWindow *pointW = (MagWindow *) NULL;
Rect editRect, rootRect;
Transform tinv;
@@ -363,6 +364,7 @@ CmdShowtech(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
FILE *outf;
bool verbose;
char **av;
@@ -431,6 +433,7 @@ CmdTilestats(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
CellUse *selectedUse;
FILE *outf = stdout;
bool allDefs = FALSE;
@@ -569,6 +572,7 @@ cmdStatsCount(
CellDef *def,
struct countClient *cc)
{
ARG_UNUSED(cc);
int cmdStatsCountTile(Tile *tile, struct cellInfo *ci);
int pNum;
struct cellInfo *ci;
@@ -756,6 +760,7 @@ CmdPsearch(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
char *RunStats(int flags, struct tms *lastt, struct tms *deltat);
static struct tms tlast, tdelta;
Point p;
@@ -868,6 +873,7 @@ CmdTsearch(
MagWindow *w,
TxCommand *cmd)
{
ARG_UNUSED(w);
int cmdTsrFunc(Tile *tp);
char *RunStats(int flags, struct tms *lastt, struct tms *deltat);
char *rstatp;
database/DBbound.c
-1
View File
@@ -61,7 +61,6 @@ DBBoundCellPlane(def, extended, rect)
TreeFilter filter;
DBCellBoundStruct cbs;
int dbCellBoundFunc();
Plane *plane;
filter.tf_func = NULL;
filter.tf_arg = (ClientData)&cbs;
database/DBcell.c
-7
View File
@@ -150,10 +150,6 @@ DBPlaceCell (use, def)
CellUse * use; /* new celluse to add to subcell tile plane */
CellDef * def; /* parent cell's definition */
{
Rect rect; /* argument to DBSrCellPlaneArea(), placeCellFunc() */
BPlane *bplane; /* argument to DBSrCellPlaneArea(), placeCellFunc() */
struct searchArg arg; /* argument to placeCellFunc() */
ASSERT(use != (CellUse *) NULL, "DBPlaceCell");
ASSERT(def, "DBPlaceCell");
@@ -184,9 +180,6 @@ DBPlaceCellNoModify (use, def)
CellUse * use; /* new celluse to add to subcell tile plane */
CellDef * def; /* parent cell's definition */
{
Rect rect; /* argument to DBSrCellPlaneArea(), placeCellFunc() */
BPlane *bplane; /* argument to DBSrCellPlaneArea(), placeCellFunc() */
struct searchArg arg; /* argument to placeCellFunc() */
ASSERT(use != (CellUse *) NULL, "DBPlaceCell");
ASSERT(def, "DBPlaceCell");
database/DBcellcopy.c
+2 -3
View File
@@ -388,7 +388,7 @@ dbCopyMaskHintsFunc(key, value, puds)
CellDef *dest = puds->puds_dest;
Transform *trans = puds->puds_trans;
char *propstr = (char *)value;
char *parentprop, *newvalue, *vptr;
char *parentprop, *newvalue;
Rect r, rnew;
bool propfound;
@@ -615,7 +615,6 @@ DBFlattenInPlace(use, dest, xMask, dolabels, toplabels, doclear)
for (lab = dest->cu_def->cd_labels; lab; lab = lab->lab_next)
{
Label *newlab;
char *newtext;
if (lab->lab_flags & LABEL_GENERATE)
@@ -917,7 +916,6 @@ DBCellGenerateSimpleSubstrate(scx, subType, notSubMask, targetDef)
int plane;
Rect rect;
TileTypeBitMask allButSubMask;
TileTypeBitMask defaultSubTypeMask;
int dbEraseSubFunc();
int dbPaintSubFunc();
int dbEraseNonSub();
@@ -1192,6 +1190,7 @@ dbCopyAllLabels(scx, lab, tpath, arg)
TerminalPath *tpath;
struct copyLabelArg *arg;
{
ARG_UNUSED(tpath);
Rect labTargetRect;
Point labOffset;
int targetPos, labRotate;
database/DBcellname.c
+4 -1
View File
@@ -455,7 +455,6 @@ dbCellPrintInfo(StartDef, who, dolist)
CellDef *celldef;
CellUse *celluse;
char *cu_name;
bool topdone;
switch (who) {
case SELF:
@@ -1254,6 +1253,7 @@ dbLockUseFunc(selUse, use, transform, data)
Transform *transform;
ClientData data;
{
ARG_UNUSED(transform);
bool dolock = *((bool *)data);
if (EditCellUse && !DBIsChild(use, EditCellUse))
@@ -1450,6 +1450,7 @@ dbOrientUseFunc(selUse, use, transform, data)
Transform *transform;
ClientData data;
{
ARG_UNUSED(transform);
bool *dodef = (bool *)data;
int orient;
@@ -1608,6 +1609,8 @@ dbAbutmentUseFunc(selUse, use, transform, data)
Transform *transform;
ClientData data;
{
ARG_UNUSED(selUse);
ARG_UNUSED(transform);
Rect bbox, refbox;
Transform *trans;
char *propvalue;
database/DBcellsrch.c
+1 -3
View File
@@ -1802,7 +1802,7 @@ int dbScaleProp(name, value, cps)
CellPropStruct *cps;
{
int scalen, scaled;
char *newvalue, *vptr;
char *newvalue;
Rect r;
if ((strlen(name) > 5) && !strncmp(name + strlen(name) - 5, "_BBOX", 5))
@@ -1940,7 +1940,6 @@ dbScaleCell(cellDef, scalen, scaled)
int dbCellScaleFunc(), dbCellUseEnumFunc();
Label *lab;
int pNum;
LinkedTile *lhead, *lt;
LinkedCellUse *luhead, *lu;
Plane *newplane;
BPlane *cellPlane, *cellPlaneOrig;
@@ -2155,7 +2154,6 @@ DBMoveCell(cellDef, origx, origy)
int dbCellTileEnumFunc(), dbCellUseEnumFunc();
Label *lab;
int pNum;
LinkedTile *lhead, *lt;
LinkedCellUse *luhead, *lu;
Plane *newplane;
BPlane *cellPlane, *cellPlaneOrig;
database/DBconnect.c
+2 -2
View File
@@ -737,8 +737,9 @@ int
dbcUnconnectFunc(tile, clientData)
Tile *tile; /* Current tile */
ClientData clientData; /* Unused. */
{
ARG_UNUSED(tile);
ARG_UNUSED(clientData);
return 1;
}
@@ -946,7 +947,6 @@ dbcConnectFunc(tile, cx)
TileTypeBitMask notConnectMask;
Rect *srArea;
SearchContext *scx = cx->tc_scx;
SearchContext scx2;
TileType loctype = TiGetTypeExact(tile);
TileType dinfo = 0;
int retval, i, pNum = cx->tc_plane;
database/DBexpand.c
-1
View File
@@ -183,7 +183,6 @@ dbExpandFunc(scx, arg)
struct expandArg *arg; /* Client data from caller */
{
CellUse *childUse = scx->scx_use;
int n = DBLambda[1];
/*
* Change the expansion status of this cell if necessary. Call the
database/DBio.c
+9 -12
View File
@@ -225,11 +225,10 @@ DBSearchForTech(techname, techroot, pathroot, level)
char *pathroot;
int level;
{
char *newpath, *found, *dptr;
char *newpath, *found;
struct dirent *tdent;
DIR *tdir;
LinkedDirent *dlist = NULL, *ld, *ldlast = NULL;
int dlen;
/* Avoid potential infinite looping. Any tech file should not be very */
/* far down the path. 10 levels is already excessive. */
@@ -525,13 +524,11 @@ dbCellReadDef(f, cellDef, ignoreTech, dereference)
{
int cellStamp = 0, rectCount = 0, rectReport = 10000;
char line[2048], tech[50], layername[50];
PaintResultType *ptable;
bool result = TRUE, scaleLimit = FALSE, has_mismatch;
Rect *rp;
int c;
TileType type, rtype, loctype;
TileTypeBitMask *rmask, typemask;
Plane *plane;
Rect r;
int n = 1, d = 1;
HashTable dbUseTable;
@@ -1232,7 +1229,6 @@ DBReadBackup(name, archive, usederef)
char *filename, *rootname, *chrptr, *suffix, *filetype;
char line[256];
CellDef *cellDef;
bool result = TRUE;
if (archive)
{
@@ -1447,7 +1443,7 @@ dbReadOpen(cellDef, setFileName, dereference, errptr)
{
FILETYPE f = NULL;
int fd;
char *filename, *realname, *savename;
char *filename, *realname;
bool is_locked;
#ifdef FILE_LOCKS
@@ -1654,6 +1650,7 @@ DBOpenOnly(cellDef, name, setFileName, errptr)
*/
int *errptr; /* Pointer to int to hold error value */
{
ARG_UNUSED(name);
dbReadOpen(cellDef, setFileName, FALSE, errptr);
}
@@ -3261,7 +3258,7 @@ dbFindPropGCFFunc(key, value, ggcf)
int *ggcf; /* Client data */
{
Rect bbox;
char *vptr = value, *sptr;
char *vptr = value;
int numvals, n;
if (!strcmp(key, "FIXED_BBOX"))
@@ -3398,6 +3395,7 @@ dbCountUseFunc(cellUse, count)
CellUse *cellUse; /* Cell use whose "call" is to be written to a file */
int *count;
{
ARG_UNUSED(cellUse);
(*count)++;
return 0;
}
@@ -3491,6 +3489,8 @@ dbCountPropFunc(key, value, count)
ClientData value;
int *count; /* Client data */
{
ARG_UNUSED(key);
ARG_UNUSED(value);
(*count)++;
return 0;
}
@@ -3551,9 +3551,6 @@ DBCellWriteFile(cellDef, f)
int reducer;
char *estring;
char lstring[2048];
char *propvalue;
bool propfound;
CellUse **useList;
int i, numUses = 0, numProps = 0;
struct cellUseList cul;
pwfrec pwf;
@@ -4187,12 +4184,10 @@ dbWritePaintCommandsFunc(tile, cdarg)
Tile *tile;
ClientData cdarg;
{
char pstring[256];
struct writeArg *arg = (struct writeArg *) cdarg;
FILE *f = arg->wa_file;
TileType type = TiGetType(tile);
TileTypeBitMask *lMask, *rMask;
int diridx;
static const char *directionNames[] = {"nw", "se", "sw", "ne", 0};
@@ -4760,6 +4755,7 @@ dbClearCellFunc(cellUse, cdarg)
CellUse *cellUse; /* Cell use */
ClientData cdarg; /* Not used */
{
ARG_UNUSED(cdarg);
cellUse->cu_def->cd_flags &= ~CDVISITED;
return 0;
}
@@ -5231,6 +5227,7 @@ dbCheckModifiedCellsFunc(def, cdata)
CellDef *def; /* Pointer to CellDef to be saved */
ClientData cdata; /* Unused */
{
ARG_UNUSED(cdata);
if (def->cd_flags & (CDINTERNAL | CDNOEDIT | CDNOTFOUND)) return 0;
else if (!(def->cd_flags & CDAVAILABLE)) return 0;
return 1;
database/DBlabel.c
+2 -3
View File
@@ -1316,8 +1316,7 @@ DBFontLabelSetBBox(label)
char *tptr;
Point *coffset, rcenter;
Rect *cbbox, locbbox, *frect;
Transform labTransform = GeoIdentityTransform;
int i, ysave, size;
int i, ysave;
double rrad, cr, sr, tmpx, tmpy;
bool expand;
@@ -1563,7 +1562,7 @@ DBLoadFont(fontfile, scale)
"v", "w", "x", "y", "z", "braceleft", "bar", "braceright",
"asciitilde", ".notdef", NULL
};
int i, j, x, y, asciiidx, chardef, numidx;
int i, j, asciiidx, chardef, numidx;
int numtok[NUMBUF];
char *token, *psname = NULL;
MagicFont *newFont = NULL, **newDBFontList;
database/DBpaint.c
+1 -3
View File
@@ -744,7 +744,7 @@ DBSplitTile(plane, point, splitx)
Point *point;
int splitx;
{
Tile *tile, *newtile, *tp;
Tile *tile, *newtile;
tile = PlaneGetHint(plane);
GOTOPOINT(tile, point);
@@ -805,7 +805,6 @@ DBFracturePlane(plane, area, resultTbl, undo)
TileType oldType;
Tile *tile, *newtile;
Tile *tpnew; /* Used for area search */
Tile *tp; /* Used for paint */
if (area->r_xtop <= area->r_xbot || area->r_ytop <= area->r_ybot)
return;
@@ -1511,7 +1510,6 @@ DBNMPaintPlane0(plane, exacttype, area, resultTbl, undo, method)
if (exacttype & TT_DIAGONAL)
{
int dbNMEnumFunc(); /* Forward reference */
TileRect arg;
dinfo.resultTbl = resultTbl;
dinfo.dir = (exacttype & TT_DIRECTION) ? 1 : 0;
database/DBtcontact.c
+1 -2
View File
@@ -171,6 +171,7 @@ DBTechAddContact(sectionName, argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(sectionName);
TileType contactType;
int nresidues;
@@ -216,7 +217,6 @@ DBTechAddContact(sectionName, argc, argv)
else
{
TileType lastType = TT_SPACE;
char *primary;
while (--argc > 1)
{
@@ -826,7 +826,6 @@ DBTechTypesOnPlane(src, plane)
int plane;
{
int i;
PlaneMask pmask;
for (i = 0; i < DBNumTypes; i++)
if (TTMaskHasType(src, i))
database/DBtech.c
+3
View File
@@ -106,6 +106,7 @@ DBTechSetTech(sectionName, argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(sectionName);
if (argc != 1)
{
if (argc == 2)
@@ -174,6 +175,7 @@ DBTechSetVersion(sectionName, argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(sectionName);
char *contline;
int n, slen;
@@ -312,6 +314,7 @@ DBTechAddConnect(sectionName, argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(sectionName);
TileTypeBitMask types1, types2;
TileType t1, t2;
database/DBtechname.c
-1
View File
@@ -155,7 +155,6 @@ DBTechNameTypes(typename, bitmask)
char *slash;
TileType type;
int plane;
LayerInfo *lp;
TTMaskZero(bitmask);
slash = strchr(typename, '/');
database/DBtechtype.c
+2 -2
View File
@@ -269,6 +269,7 @@ DBTechAddPlane(
int argc,
char *argv[])
{
ARG_UNUSED(sectionName);
const char *cp;
if (DBNumPlanes >= PL_MAXTYPES)
@@ -344,8 +345,7 @@ DBTechAddAlias(sectionName, argc, argv)
int argc;
char *argv[];
{
char *cp;
int pNum;
ARG_UNUSED(sectionName);
HashEntry *he;
TileType atype;
TileTypeBitMask *amask, tmask;
database/DBtiles.c
+1 -1
View File
@@ -829,7 +829,7 @@ DBClearCellPlane(def)
int dbDeleteCellUse(CellUse *use, ClientData arg)
{
CellDef *def = (CellDef *)arg;
ARG_UNUSED(arg);
CellUse *defuses, *lastuse;
dbInstanceUnplace(use);
database/DBtpaint.c
+1
View File
@@ -597,6 +597,7 @@ dbTechAddPaintErase(type, sectionName, argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(sectionName);
int pNum;
PlaneMask pMask, rMask;
TileType t1, t2, tres;
database/DBtpaint2.c
+5 -6
View File
@@ -734,10 +734,10 @@ void
DBLockContact(ctype)
TileType ctype;
{
LayerInfo *lpImage, *lpPaint;
TileType c, n, itype, eresult;
LayerInfo *lpPaint;
TileType n;
TileTypeBitMask *rmask;
int m, pNum;
int pNum;
/* Have type, Erase * --> Result is type */
@@ -778,9 +778,7 @@ DBUnlockContact(ctype)
TileType ctype;
{
LayerInfo *lpImage, *lpPaint;
TileType n, itype, eresult;
TileTypeBitMask *rmask;
int m, pNum;
TileType n;
lpImage = &dbLayerInfo[ctype];
@@ -868,6 +866,7 @@ dbComposeDecompose(imageType, componentType, remainingType)
TileType componentType;
TileType remainingType;
{
ARG_UNUSED(remainingType);
int pNum = DBPlane(imageType);
TileType resultType;
dbwind/DBWdisplay.c
+5 -4
View File
@@ -163,6 +163,7 @@ DBWredisplay(w, rootArea, clipArea)
Rect *clipArea; /* The screen area that we should clip to
*/
{
ARG_UNUSED(clipArea);
int i;
TileTypeBitMask *mask;
SearchContext scontext;
@@ -170,7 +171,7 @@ DBWredisplay(w, rootArea, clipArea)
int bitMask, lambdasPerPixel, pixelsPerLambda;
DBWclientRec *crec;
CellDef *cellDef;
TileTypeBitMask layers, rmask;
TileTypeBitMask layers;
/*
TxPrintf("Root area (%d, %d) (%d, %d) redisplay.\n",
@@ -703,7 +704,6 @@ DBWDrawLabel(label, rect, pos, style, labelSize, sizeBox)
Point p;
Rect location;
char *text = label->lab_text;
int result;
if (style >= 0) GrSetStuff(style);
GrDrawFastBox(rect, labelSize);
@@ -791,7 +791,6 @@ DBWDrawFontLabel(label, window, trans, style)
Rect rootArea, labrect;
int i, rotate, minv, scaledLambdasPerPixel;
dlong tmp, dval, scale;
double rads;
GeoTransRect(trans, &label->lab_rect, &rootArea);
WindSurfaceToScreen(window, &rootArea, &labrect);
@@ -930,8 +929,9 @@ dbwLabelFunc(scx, label, tpath, clientData)
TerminalPath *tpath; /* Contains pointer to full pathname of label */
ClientData clientData; /* Used for mask for dbw_visibleLayers */
{
ARG_UNUSED(tpath);
Rect labRect, tmp;
int screenPos, screenRot, newStyle;
int screenPos, newStyle;
TileTypeBitMask *vmask;
vmask = (TileTypeBitMask *)clientData;
@@ -1725,6 +1725,7 @@ DBWTechAddStyle(sectionName, argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(sectionName);
TileType t, r;
TileTypeBitMask *rMask;
int i, sidx;
dbwind/DBWelement.c
+1 -3
View File
@@ -339,6 +339,7 @@ DBWElementRedraw(window, plane)
* needs to be redrawn.
*/
{
ARG_UNUSED(plane);
int curStyle, newStyle;
styleptr stylePtr;
CellDef *windowRoot;
@@ -570,7 +571,6 @@ void
DBWElementDelete(MagWindow *w, char *name)
{
DBWElement *elem;
CellDef *currentRoot;
HashEntry *entry;
styleptr stylePtr;
@@ -673,7 +673,6 @@ DBWElementInbox(area)
DBWElement *elem;
HashSearch hs;
HashEntry *he;
int sqdist;
#ifndef MAGIC_WRAPPER
TxPrintf("Element(s) inside box: ");
@@ -1201,7 +1200,6 @@ DBWElementPos(MagWindow *w, char *ename, Rect *crect)
{
DBWElement *elem;
HashEntry *entry;
Rect prect;
char ptemp[22];
entry = HashFind(&elementTable, ename);
dbwind/DBWfdback.c
+1 -1
View File
@@ -276,7 +276,7 @@ void
DBWFeedbackClear(text)
char *text;
{
int i, oldCount;
int oldCount;
Feedback *fb, *fl, *fe;
Rect area;
CellDef *currentRoot;
dbwind/DBWhlights.c
-1
View File
@@ -242,7 +242,6 @@ dbwhlRedrawFunc(window, area)
if (dbwhlErase)
{
bool needErase = TRUE;
erase.r_xbot += expand.r_xbot;
erase.r_ybot += expand.r_ybot;
dbwind/DBWprocs.c
-3
View File
@@ -292,7 +292,6 @@ DBWloadWindow(window, name, flags)
int xadd, yadd;
Rect loadBox;
char *rootname;
bool isUnnamed;
int UnexpandFunc(); /* forward declaration */
bool ignoreTech; /* If FALSE, indicates that the technology of
@@ -677,7 +676,6 @@ DBWcommands(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
int cmdNum;
/* If it was a keyboard command, just dispatch to the proper
* command routine.
@@ -781,7 +779,6 @@ void
DBWinit()
{
MagWindow *initialWindow;
int i;
static char *doc =
"You are currently using the \"box\" tool. The button actions are:\n"
" left - move the box so its lower-left corner is at cursor position\n"
dbwind/DBWtools.c
+1
View File
@@ -493,6 +493,7 @@ DBWDrawCrosshair(window, plane)
* which highlight areas must be redrawn.
*/
{
ARG_UNUSED(plane);
Point p;
/* Unlike most highlights, which are related to the database and */
drc/DRCarray.c
+6 -3
View File
@@ -104,8 +104,8 @@ drcArrayFunc(scx, arg)
{
int xsep, ysep;
int xsize, ysize;
int rval, oldTiles;
Rect errorArea, yankArea, tmp, tmp2, saveClip;
int oldTiles;
Rect errorArea, yankArea, tmp, tmp2;
DRCCookie *save_cptr;
CellUse *use = scx->scx_use;
Rect *area;
@@ -113,7 +113,6 @@ drcArrayFunc(scx, arg)
void (*drcArrayErrorFunc)(); /* Function to call on violations. */
ClientData drcArrayClientData; /* Extra parameter to pass to func. */
PaintResultType (*savedPaintTable)[NT][NT];
PaintResultType (*savedEraseTable)[NT][NT];
int (*savedPaintPlane)();
if ((use->cu_xlo == use->cu_xhi) && (use->cu_ylo == use->cu_yhi))
@@ -291,6 +290,8 @@ drcArrayYankFunc(use, transform, x, y, yankArea)
Rect *yankArea; /* Area to yank (in parent coords). */
{
ARG_UNUSED(x);
ARG_UNUSED(y);
SearchContext scx;
Transform tinv;
@@ -332,6 +333,8 @@ drcArrayOverlapFunc(use, transform, x, y, arg)
* checking. See drcExactOverlapTile.
*/
{
ARG_UNUSED(x);
ARG_UNUSED(y);
Transform tinv;
SearchContext scx;
drc/DRCbasic.c
+3 -5
View File
@@ -182,7 +182,6 @@ areaCheck(tile, arg)
if (arg->dCD_radial != 0)
{
unsigned int i;
int sqx, sqy;
int sdist = arg->dCD_radial & 0xfff;
long sstest, ssdist = (long) sdist * sdist;
@@ -440,11 +439,11 @@ drcTile (tile, arg)
Rect *rect = arg->dCD_rect; /* Area being checked */
Rect errRect; /* Area checked for an individual rule */
MaxRectsData *mrd; /* Used by widespacing rule */
TileTypeBitMask tmpMask, *rMask;
TileTypeBitMask tmpMask;
bool trigpending; /* Hack for widespacing rule */
bool firsttile;
int triggered;
int cdist, dist, ccdist, result;
int cdist, dist, result;
arg->dCD_constraint = &errRect;
@@ -475,7 +474,6 @@ drcTile (tile, arg)
if (IsSplit(tile) && !SplitSide(tile))
{
int deltax, deltay;
TileType tt, to;
tt = TiGetLeftType(tile); /* inside type */
@@ -495,7 +493,7 @@ drcTile (tile, arg)
{
int deltax, deltay, w, h;
double r;
TileType dinfo, dsplit;
TileType dinfo;
/* Work to be done: Handle triggering rules for non-Manhattan */
/* edges; especially important for the wide-spacing rule. */
drc/DRCcif.c
+8 -10
View File
@@ -116,6 +116,7 @@ drcCifSetStyle(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
CIFKeep *new;
for (new = CIFStyleList; new != NULL; new = new->cs_next)
@@ -182,11 +183,11 @@ drcCifWidth(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layername = argv[1];
int scalefactor;
int centidistance = atoi(argv[2]);
int why = drcWhyCreate(argv[3]);
TileTypeBitMask set, setC, tmp1;
int thislayer = -1;
DRCCookie *dpnew,*dpnext;
TileType i;
@@ -243,11 +244,12 @@ drcCifSpacing(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *adjacency = argv[4];
int why = drcWhyCreate(argv[5]);
DRCCookie *dpnext, *dpnew;
int needReverse = FALSE;
TileType i, j;
TileType i;
int scalefactor;
int centidistance = atoi(argv[3]);
char *layers[2];
@@ -571,7 +573,6 @@ drcCifCheck(arg)
for (drcCifCur = drcCifRules[i][j];
drcCifCur; drcCifCur = drcCifCur->drcc_next)
{
TileTypeBitMask *mask;
arg->dCD_plane = i;
DBSrPaintArea((Tile *) NULL, CIFPlanes[i], &cifrect,
@@ -1073,7 +1074,6 @@ areaCifCheck(tile, arg)
*/
if (arg->dCD_radial != 0)
{
unsigned int i;
int sqx, sqy;
int sdist = arg->dCD_radial & 0xfff;
long sstest, ssdist = (long) sdist * sdist;
@@ -1176,14 +1176,13 @@ drcCifArea(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
int centiarea = atoi(argv[2]);
int centihorizon = atoi(argv[3]);
int why = drcWhyCreate(argv[4]);
TileTypeBitMask set, setC, tmp1;
DRCCookie *dpnext, *dpnew;
TileType i, j;
int plane;
TileType i;
int thislayer = -1;
int scalefactor;
@@ -1237,14 +1236,13 @@ drcCifMaxwidth(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
int centidistance = atoi(argv[2]);
char *bends = argv[3];
int why = drcWhyCreate(argv[4]);
TileTypeBitMask set, setC, tmp1;
DRCCookie *dpnext, *dpnew;
TileType i, j;
int plane;
TileType i;
int bend;
int thislayer = -1;
int scalefactor;
drc/DRCcontin.c
+3 -1
View File
@@ -188,12 +188,13 @@ DRCCheckThis (celldef, operation, area)
TileType operation; /* TT_CHECKPAINT or TT_CHECKSUBCELL */
Rect * area; /* Area that changed. */
{
ARG_UNUSED(operation);
CellUse * cu; /* Ptr to uses of the given CellDef */
Rect transRect; /* Area in coords of parent CellDefs,
* expanded if the use is in an array
*/
Rect dummyRect, dummyRect2;
DRCPendingCookie * p, ** pback; /* Used to insert new element in list
DRCPendingCookie * p; /* Used to insert new element in list
* of CellDefs waiting for DRC
*/
@@ -642,6 +643,7 @@ drcCheckTile(tile, arg)
Tile * tile; /* tile in DRC_CHECK plane */
ClientData arg; /* Not used. */
{
ARG_UNUSED(arg);
Rect square; /* Square area of the checkerboard
* being processed right now.
*/
drc/DRCextend.c
+1 -2
View File
@@ -490,8 +490,7 @@ drcCanonicalMaxwidth(starttile, dir, arg, cptr)
struct drcClientData *arg;
DRCCookie *cptr;
{
int s, edgelimit;
Tile *tile,*tp;
int edgelimit;
TileTypeBitMask wrongtypes;
static MaxRectsData *mrd = (MaxRectsData *)NULL;
Rect *boundrect, boundorig;
drc/DRCmain.c
+9 -5
View File
@@ -151,6 +151,7 @@ drcPaintError(celldef, rect, cptr, plane)
DRCCookie * cptr; /* Design rule violated -- not used */
Plane * plane; /* Where to paint error tiles. */
{
ARG_UNUSED(cptr);
PaintUndoInfo ui;
ui.pu_def = celldef;
@@ -275,9 +276,9 @@ drcPrintError (celldef, rect, cptr, scx)
DRCCookie * cptr; /* Design rule violated */
SearchContext * scx; /* Only errors in scx->scx_area get reported. */
{
HashEntry *h;
ARG_UNUSED(celldef);
int i;
Rect *area, r;
Rect *area;
ASSERT (cptr != (DRCCookie *) NULL, "drcPrintError");
@@ -306,7 +307,7 @@ drcListError (celldef, rect, cptr, scx)
DRCCookie * cptr; /* Design rule violated */
SearchContext * scx; /* Only errors in scx->scx_area get reported */
{
HashEntry *h;
ARG_UNUSED(celldef);
int i;
Rect *area;
@@ -340,6 +341,7 @@ drcListallError (celldef, rect, cptr, scx)
DRCCookie * cptr; /* Design rule violated */
SearchContext * scx; /* Only errors in scx->scx_area get reported. */
{
ARG_UNUSED(celldef);
Tcl_Obj *lobj, *pobj;
HashEntry *h;
Rect *area, r;
@@ -488,7 +490,7 @@ DRCWhy(dolist, use, area, findonly)
{
SearchContext scx;
Rect box;
int i, nerrors;
int i;
extern void drcWhyFunc(); /* Forward reference. */
LinkedIndex *li;
@@ -558,6 +560,7 @@ DRCWhyAll(use, area, fout)
* Write formatted output to fout
*/
{
ARG_UNUSED(fout);
SearchContext scx;
Rect box;
extern int drcWhyAllFunc(); /* Forward reference. */
@@ -656,6 +659,7 @@ drcWhyAllFunc(scx, cdarg)
SearchContext *scx; /* Describes current state of search. */
ClientData cdarg; /* Unused */
{
ARG_UNUSED(cdarg);
CellDef *def = scx->scx_use->cu_def;
/* Check paint and interactions in this subcell. */
@@ -717,6 +721,7 @@ drcCheckFunc(scx, cdarg)
SearchContext *scx;
ClientData cdarg; /* Not used. */
{
ARG_UNUSED(cdarg);
Rect cellArea;
CellDef *def;
@@ -781,7 +786,6 @@ DRCCount(use, area, recurse)
HashSearch hs;
int count;
SearchContext scx;
CellDef *def;
extern int drcCountFunc();
/* Shouldn't happen? */
drc/DRCprint.c
+1 -1
View File
@@ -169,7 +169,7 @@ maskToPrint (mask)
int i;
int gotSome = FALSE;
static char printchain[512];
char buffer[20], *drcName;
char buffer[20];
int bufsize = 511;
if (TTMaskIsZero(mask))
drc/DRCsubcell.c
+4 -1
View File
@@ -228,7 +228,7 @@ drcSubcellFunc(subUse, flags)
CellUse *subUse; /* Subcell instance. */
int *flags; /* Information to propagate up */
{
Rect area, haloArea, intArea, subIntArea, locIntArea;
Rect area, haloArea, intArea, subIntArea;
int i;
/* A subcell has been seen, so set the "cell found" flag */
@@ -965,5 +965,8 @@ drcIncCount(def, area, rule, count)
DRCCookie *rule;
int *count;
{
ARG_UNUSED(def);
ARG_UNUSED(area);
ARG_UNUSED(rule);
(*count)++;
}
drc/DRCtech.c
+16 -15
View File
@@ -67,11 +67,6 @@ global int DRCRuleOptimization = TRUE;
static int drcRulesSpecified = 0;
static int drcRulesOptimized = 0;
/* Rules with unique names are tagged with a reference number */
/* for use in placing errors into the DRC error plane. */
static int DRCtag = 0;
/*
* Forward declarations.
*/
@@ -279,7 +274,6 @@ void
drcTechFreeStyle()
{
int i, j;
char *old;
DRCCookie *dp;
if (DRCCurStyle != NULL)
@@ -481,7 +475,6 @@ drcLoadStyle(stylename)
void
DRCReloadCurStyle()
{
char *stylename;
DRCKeep * style;
if (DRCCurStyle == NULL) return;
@@ -1019,6 +1012,7 @@ DRCTechAddRule(sectionName, argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(sectionName);
int which, distance, mdist;
const char *fmt;
static const struct
@@ -1158,6 +1152,7 @@ drcExtend(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers1 = argv[1];
char *layers2 = argv[2];
int distance = atoi(argv[3]);
@@ -1334,6 +1329,7 @@ drcWidth(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
int distance = atoi(argv[2]);
int why;
@@ -1445,6 +1441,7 @@ drcArea(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
int distance = atoi(argv[2]);
int horizon = atoi(argv[3]);
@@ -1525,6 +1522,7 @@ drcOffGrid(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
int pitch = atoi(argv[2]);
int why = drcWhyCreate(argv[3]);
@@ -1722,6 +1720,7 @@ drcAngles(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
char *endptr;
long value;
@@ -1902,10 +1901,10 @@ drcSpacing3(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers1 = argv[1], *layers2 = argv[2];
char *layers3 = argv[5];
int distance = atoi(argv[3]);
char *adjacency = argv[4];
int why = drcWhyCreate(argv[6]);
TileTypeBitMask set1, set2, set3;
int plane;
@@ -2006,13 +2005,12 @@ drcMaskSpacing(set1, set2, pmask1, pmask2, wwidth, distance, adjacency,
{
TileTypeBitMask tmp1, tmp2, setR, setRreverse;
int plane, plane2;
PlaneMask pset, ptest;
PlaneMask pset;
DRCCookie *dp, *dpnew;
int needReverse = (widerule) ? TRUE : FALSE;
TileType i, j, pref;
TileType i, j;
bool needtrigger = FALSE;
bool touchingok = TRUE;
bool cornerok = FALSE;
bool surroundok = FALSE;
unsigned short flags = 0;
@@ -2862,6 +2860,7 @@ drcOverhang(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers2 = argv[1], *layers1 = argv[2];
int distance = atoi(argv[3]);
int why = drcWhyCreate(argv[4]);
@@ -2999,6 +2998,7 @@ drcRectOnly(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
int why = drcWhyCreate(argv[2]);
TileTypeBitMask set1, set2, setC;
@@ -3404,6 +3404,7 @@ drcNoOverlap(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers1 = argv[1], *layers2 = argv[2];
TileTypeBitMask set1, set2;
TileType i, j;
@@ -3458,6 +3459,7 @@ drcExactOverlap(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
TileTypeBitMask set;
@@ -3502,6 +3504,7 @@ drcRectangle(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
char *layers = argv[1];
int why = drcWhyCreate(argv[4]);
TileTypeBitMask types, nottypes;
@@ -3672,6 +3675,7 @@ drcStepSize(argc, argv)
int argc;
char *argv[];
{
ARG_UNUSED(argc);
if (DRCCurStyle == NULL) return 0;
DRCCurStyle->DRCStepSize = atoi(argv[1]);
@@ -3710,7 +3714,6 @@ drcStepSize(argc, argv)
void
DRCTechFinal()
{
DRCStyle *ds;
/* Create a "default" style if there isn't one */
@@ -4222,8 +4225,6 @@ void
DRCTechScale(scalen, scaled)
int scalen, scaled;
{
DRCCookie *dp;
TileType i, j;
int scalegcf;
if (DRCCurStyle == NULL) return;
@@ -4492,7 +4493,7 @@ DRCGetDirectionalLayerSurround(ttype1, ttype2)
{
int layerSurround = 0;
DRCCookie *cptr, *cnext;
TileTypeBitMask *set, *cset;
TileTypeBitMask *set;
for (cptr = DRCCurStyle->DRCRulesTbl[ttype1][TT_SPACE]; cptr != (DRCCookie *) NULL;
cptr = cptr->drcc_next)
ext2sim/ext2sim.c
+7
View File
@@ -867,6 +867,7 @@ simParseArgs(
char ***pargv,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
char **argv = *pargv;
int argc = *pargc;
@@ -1022,6 +1023,7 @@ simdevVisit(
Transform *trans, /* Coordinate transform */
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
const DevTerm *gate, *source, *drain, *term;
const EFNode *subnode;
EFNode *snode, *dnode;
@@ -1543,6 +1545,7 @@ simcapVisit(
double cap,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
cap = cap / 1000;
if (cap <= EFCapThreshold)
return 0;
@@ -1590,6 +1593,7 @@ simresistVisit(
float res,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
fprintf(esSimF, "r ");
EFHNOut(hierName1, esSimF);
fprintf(esSimF, " ");
@@ -1625,6 +1629,7 @@ simnodeVisit(
double cap,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
const EFNodeName *nn;
const HierName *hierName;
bool isGlob;
@@ -1797,6 +1802,8 @@ simmergeVisit(
Transform *trans, /* Coordinate transform (not used) */
ClientData cdata) /* unused */
{
ARG_UNUSED(trans);
ARG_UNUSED(cdata);
const DevTerm *gate, *source, *drain;
const EFNode *subnode, *snode, *dnode, *gnode;
int pmode, l, w;
ext2spice/ext2hier.c
+11
View File
@@ -144,6 +144,7 @@ spcHierWriteValue(
HierContext *hc,
Dev *dev) /* Dev being output */
{
ARG_UNUSED(hc);
DevParam *plist;
plist = efGetDeviceParams(EFDevTypes[dev->dev_type]);
@@ -686,6 +687,7 @@ spcdevHierVisit(
float scale, /* Scale transform for output */
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
DevParam *plist, *pptr;
DevTerm *gate, *source, *drain;
EFNode *subnode, *snode, *dnode, *subnodeFlat = NULL;
@@ -1295,6 +1297,7 @@ spcdevHierMergeVisit(
float scale, /* Scale of transform (may be non-integer) */
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
DevTerm *gate, *source, *drain;
EFNode *subnode, *snode, *dnode, *gnode;
int pmode, l, w;
@@ -1421,6 +1424,7 @@ spccapHierVisit(
double cap,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
cap = cap / 1000;
if (fabs(cap) <= EFCapThreshold)
return 0;
@@ -1469,6 +1473,7 @@ spcresistHierVisit(
float res,
ClientData cdata) // UNUSED
{
ARG_UNUSED(cdata);
HashEntry *he;
EFNodeName *nn;
@@ -1533,6 +1538,8 @@ spcsubHierVisit(
double cap, // Unused
char **resstrptr)
{
ARG_UNUSED(res);
ARG_UNUSED(cap);
HierName *hierName;
const char *nsn;
@@ -1570,6 +1577,7 @@ spcnodeHierVisit(
int res,
double cap)
{
ARG_UNUSED(res);
HierName *hierName;
bool isConnected = FALSE;
const char *fmt, *nsn;
@@ -1649,6 +1657,7 @@ nodeSpiceHierName(
HierContext *hc,
const HierName *hname)
{
ARG_UNUSED(hc);
EFNodeName *nn;
HashEntry *he;
EFNode *node;
@@ -1874,6 +1883,7 @@ devDistJunctHierVisit(
float scale, /* Scale tranform of output */
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
EFNode *n;
int i, l, w;
@@ -1925,6 +1935,7 @@ esMakePorts(
HierContext *hc,
ClientData cdata)
{
ARG_UNUSED(cdata);
Connection *conn;
Def *def = hc->hc_use->use_def, *portdef, *updef;
Use *use;
ext2spice/ext2spice.c
+18 -1
View File
@@ -1781,6 +1781,8 @@ subcktUndef(
HierName *hierName,
bool is_top) /* TRUE if this is the top-level cell */
{
ARG_UNUSED(hierName);
ARG_UNUSED(is_top);
Def *def = use->use_def;
def->def_flags &= ~(DEF_SUBCIRCUIT);
@@ -1831,6 +1833,7 @@ topVisit(
Def *def,
bool doStub)
{
ARG_UNUSED(doStub);
EFNode *snode;
EFNodeName *sname, *nodeName;
HashSearch hs;
@@ -2046,6 +2049,7 @@ spcWriteValue(
Dev *dev, /* Dev being output */
HierName *hierName) /* Hierarchical path down to this dev */
{
ARG_UNUSED(hierName);
DevParam *plist;
plist = efGetDeviceParams(EFDevTypes[dev->dev_type]);
@@ -2643,6 +2647,8 @@ spcdevVisit(
Transform *trans, /* (unused) */
ClientData cdata) /* (unused) */
{
ARG_UNUSED(trans);
ARG_UNUSED(cdata);
DevParam *plist, *pptr;
DevTerm *gate, *source, *drain;
EFNode *subnode, *snode, *dnode, *subnodeFlat = NULL;
@@ -3804,6 +3810,7 @@ spccapVisit(
double cap,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
cap = cap / 1000;
if (cap <= EFCapThreshold)
return 0;
@@ -3850,6 +3857,7 @@ spcresistVisit(
float res,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
HashEntry *he;
EFNodeName *nn;
@@ -3914,6 +3922,8 @@ spcsubVisit(
double cap, // Unused
ClientData cdata)
{
ARG_UNUSED(res);
ARG_UNUSED(cap);
char **resstr = (char **)CD2PTR(cdata);
HierName *hierName;
const char *nsn;
@@ -3953,6 +3963,8 @@ spcnodeVisit(
double cap,
ClientData cdata) /* unused */
{
ARG_UNUSED(res);
ARG_UNUSED(cdata);
HierName *hierName;
bool isConnected = FALSE;
const char *fmt;
@@ -4018,6 +4030,9 @@ nodeVisitDebug(
double cap,
ClientData cdata) /* unused */
{
ARG_UNUSED(res);
ARG_UNUSED(cap);
ARG_UNUSED(cdata);
HierName *hierName;
const char *nsn;
@@ -4154,7 +4169,7 @@ efHNSprintfPrefix(
HierName *hierName,
char *str)
{
char *cp, c;
char *cp;
bool convertEqual = (EFOutputFlags & EF_CONVERTEQUAL) ? TRUE : FALSE;
bool convertComma = (EFOutputFlags & EF_CONVERTCOMMA) ? TRUE : FALSE;
bool convertBrackets = (EFOutputFlags & EF_CONVERTBRACKETS) ? TRUE : FALSE;
@@ -4740,6 +4755,8 @@ devDistJunctVisit(
Transform *trans, /* (unused) */
ClientData cdata) /* (unused) */
{
ARG_UNUSED(trans);
ARG_UNUSED(cdata);
EFNode *n;
int i;
int l, w;
extcheck/extcheck.c
+12 -4
View File
@@ -22,10 +22,6 @@
* *********************************************************************
*/
#ifndef lint
static const char rcsid[] = "$Header: /usr/cvsroot/magic-8.0/extcheck/extcheck.c,v 1.1.1.1 2008/02/03 20:43:50 tim Exp $";
#endif /* not lint */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -138,6 +134,7 @@ nodeVisit(
double cap,
ClientData cdata) /* unused */
{
ARG_UNUSED(cdata);
cap = (cap + 500) / 1000;
res = (res + 500) / 1000;
@@ -159,6 +156,11 @@ devVisit(
Transform *trans,
ClientData cdata) /* UNUSED */
{
ARG_UNUSED(dev);
ARG_UNUSED(hc);
ARG_UNUSED(scale);
ARG_UNUSED(trans);
ARG_UNUSED(cdata);
ecNumDevs++;
return 0;
}
@@ -172,6 +174,9 @@ capVisit(
double cap,
ClientData cdata) /* UNUSED */
{
ARG_UNUSED(hn1);
ARG_UNUSED(hn2);
ARG_UNUSED(cdata);
ecNumCaps++;
if ((cap / 1000.) > (double) EFCapThreshold) ecNumThreshCaps++;
return 0;
@@ -186,6 +191,9 @@ resistVisit(
float res,
ClientData cdata) /* UNUSED */
{
ARG_UNUSED(hn1);
ARG_UNUSED(hn2);
ARG_UNUSED(cdata);
ecNumResists++;
if ((res / 1000.) > EFResistThreshold) ecNumThreshResists++;
return 0;
extflat/EFantenna.c
+4 -8
View File
@@ -129,18 +129,13 @@ CmdAntennaCheck(w, cmd)
{
int i, flatFlags;
char *inName;
FILE *f;
TileType t;
int option = ANTENNACHECK_RUN;
int value;
int argc = cmd->tx_argc;
char **argv = cmd->tx_argv;
const char * const *msg;
bool err_result;
short sd_rclass;
short sub_rclass;
char *devname;
int idx;
@@ -295,7 +290,7 @@ antennacheckArgs(pargc, pargv)
int *pargc;
char ***pargv;
{
char **argv = *pargv, *cp;
char **argv = *pargv;
int argc = *pargc;
switch (argv[0][1])
@@ -364,15 +359,16 @@ antennacheckVisit(
Transform *trans, /* Coordinate transform */
ClientData cdata) /* ClientData is edit cell use */
{
ARG_UNUSED(scale);
CellUse *editUse = (CellUse *) CD2PTR(cdata);
DevTerm *gate;
TileType t, conType;
int pos, pNum, pNum2, pmax, p, i, j, total;
int pos, pNum, pNum2, pmax, p, i, j;
dlong gatearea, diffarea;
double anttotal, conttotal;
float saveRatio, ratioTotal;
dlong *antennaarea;
Rect r, gaterect;
Rect r;
EFNode *gnode;
SearchContext scx;
TileTypeBitMask gatemask, saveConMask;
extflat/EFbuild.c
+2 -7
View File
@@ -167,7 +167,7 @@ efBuildNode(def, isSubsnode, isDevSubsnode, isExtNode, nodeName, nodeCap,
if (newname && (def->def_kills != NULL))
{
HashEntry *hek;
EFNodeName *nn, *knn, *nodeAlias, *lastAlias;
EFNodeName *knn, *nodeAlias, *lastAlias;
/* Watch for nodes that are aliases of the node that was most
* recently killed. This can occur in .res.ext files where an
@@ -644,8 +644,6 @@ efBuildEquiv(def, nodeName1, nodeName2, resist, isspice)
return; /* Repeated "equiv" statement */
if (nn1->efnn_node != nn2->efnn_node)
{
struct efnode *node1 = nn1->efnn_node;
struct efnode *node2 = nn2->efnn_node;
HashSearch hs;
HashEntry *he;
@@ -854,12 +852,11 @@ efBuildDevice(
DevParam *newparm, *devp, *sparm;
TileType ttype;
int dev_type;
char ptype, *pptr, **av;
char *pptr, **av;
char devhash[64];
int argstart = 1; /* start of terminal list in argv[] */
bool hasModel = strcmp(type, "None") ? TRUE : FALSE;
int area, perim; /* Total area, perimeter of primary type (i.e., channel) */
newdev = (Dev *)NULL;
devtmp.dev_subsnode = NULL;
@@ -2110,8 +2107,6 @@ efFreeUseTable(table)
HashSearch hs;
HashEntry *he;
Use *use;
HierName *hn;
EFNodeName *nn;
HashStartSearch(&hs);
while ((he = HashNext(table, &hs)))
extflat/EFdef.c
-1
View File
@@ -103,7 +103,6 @@ EFDone(func)
HashEntry *he;
Kill *kill;
Def *def;
Use *use;
int n;
HashStartSearch(&hs);
extflat/EFflat.c
+1 -4
View File
@@ -182,8 +182,7 @@ EFFlatBuildOneLevel(def, flags)
Def *def; /* root def being flattened */
int flags;
{
int usecount, savecount;
Use *use;
int usecount;
int efFlatNodesDeviceless(); /* Forward declaration */
int efFlatCapsDeviceless(); /* Forward declaration */
int flatnodeflags;
@@ -402,7 +401,6 @@ efFlatNodesDeviceless(hc, cdata)
{
int *usecount = (int *)cdata;
int newcount;
Use *use;
newcount = HashGetNumEntries(&hc->hc_use->use_def->def_uses);
@@ -965,7 +963,6 @@ efFlatCapsDeviceless(hc)
{
Connection *conn;
int newcount;
Use *use;
newcount = HashGetNumEntries(&hc->hc_use->use_def->def_uses);
extflat/EFhier.c
+3 -4
View File
@@ -325,6 +325,7 @@ EFHierVisitSubcircuits(hc, subProc, cdata)
int (*subProc)();
ClientData cdata; /* unused */
{
ARG_UNUSED(cdata);
CallArg ca;
int efHierVisitSubcircuits(); /* Forward declaration */
@@ -389,11 +390,12 @@ efHierDevKilled(hc, dev, prefix)
Dev *dev;
HierName *prefix;
{
ARG_UNUSED(hc);
ARG_UNUSED(prefix);
HierName *suffix;
HashEntry *he;
EFNodeName *nn;
int n;
Def *def = hc->hc_use->use_def;
for (n = 0; n < dev->dev_nterm; n++)
{
@@ -622,8 +624,6 @@ efHierVisitResists(
{
Def *def = hc->hc_use->use_def;
Connection *res;
Transform t;
int scale;
/* Visit all resistors */
for (res = def->def_resistors; res; res = res->conn_next)
@@ -735,7 +735,6 @@ EFHierVisitNodes(hc, nodeProc, cdata)
int (*nodeProc)();
ClientData cdata;
{
Def *def = hc->hc_use->use_def;
EFCapValue cap;
int res;
EFNode *snode;
extflat/EFname.c
+1 -3
View File
@@ -221,11 +221,9 @@ EFStrToHN(prefix, suffixStr)
char *suffixStr; /* Leaf part of name (may have /'s) */
{
char *cp;
HashEntry *he;
char *slashPtr;
HierName *hierName;
unsigned size;
int len;
/* Skip to the end of the relative name */
slashPtr = NULL;
@@ -360,7 +358,7 @@ EFHNLook(prefix, suffixStr, errorStr)
char *suffixStr; /* Part of name on leaf side */
char *errorStr; /* Explanatory string for errors */
{
HierName *hierName, *hn;
HierName *hierName;
bool dontFree = FALSE;
HashEntry *he;
extflat/EFread.c
-2
View File
@@ -191,7 +191,6 @@ efReadDef(
int argc, ac, n;
CellDef *dbdef;
EFCapValue cap;
EFNode *node;
char *line = NULL, *argv[128], *name, *attrs;
int size = 0;
int rscale = 1; /* Multiply resistances by this */
@@ -748,7 +747,6 @@ start:
if (size <= 1)
{
char *newline;
int i;
*sizeptr += 1024; /* Increase buffer size in 1024 byte increments */
newline = (char *)mallocMagic(*sizeptr);
extract/ExtBasic.c
+9 -9
View File
@@ -17,9 +17,6 @@
* *********************************************************************
*/
#ifndef lint
static char sccsid[] = "@(#)ExtBasic.c 4.13 MAGIC (Berkeley) 12/5/85";
#endif /* not lint */
#include <stdio.h>
#include <stdlib.h>
@@ -170,6 +167,7 @@ extFoundFunc(tile, cxp)
Tile *tile;
TreeContext *cxp;
{
ARG_UNUSED(tile);
CellDef *def = (CellDef *)cxp->tc_filter->tf_arg;
return (def == cxp->tc_scx->scx_use->cu_def) ? 0 : 1;
}
@@ -855,7 +853,6 @@ char *
extSubsName(node)
LabRegion *node;
{
char *subsName;
/* If the techfile specifies a global name for the substrate, use */
/* that in preference to the default "p_x_y#" name. Use this name */
@@ -2117,6 +2114,7 @@ extSDTileFunc(tile, pNum)
Tile *tile;
int pNum;
{
ARG_UNUSED(pNum);
LinkedTile *newdevtile;
newdevtile = (LinkedTile *)mallocMagic(sizeof(LinkedTile));
@@ -2198,7 +2196,7 @@ extOutputDevices(def, transList, outFile)
LabelList *ll;
TileType t;
char *subsName;
int nsd, length, width, n, i, ntiles, corners, tn, rc, termcount;
int nsd, length, width, n, i, ntiles, termcount;
double dres, dcap;
char mesg[256];
bool isAnnular, hasModel, sd_is_tied;
@@ -3116,6 +3114,7 @@ extTransFindSubs(tile, t, mask, def, sn, layerptr)
NodeRegion **sn;
TileType *layerptr;
{
ARG_UNUSED(t);
Rect tileArea, tileAreaPlus;
int pNum;
int extTransFindSubsFunc1(); /* Forward declaration */
@@ -3195,7 +3194,6 @@ extTransFindId(tile, mask, def, idtypeptr)
CellDef *def;
TileType *idtypeptr;
{
TileType type;
Rect tileArea;
int pNum;
int extTransFindIdFunc1(); /* Forward declaration */
@@ -3337,9 +3335,9 @@ extTransTileFunc(tile, pNum, arg)
int pNum;
FindRegion *arg;
{
TileTypeBitMask mask, cmask, *smask;
TileTypeBitMask mask, cmask;
TileType loctype, idlayer, sublayer;
int perim, result, i;
int perim;
bool allow_globsubsnode;
ExtDevice *devptr, *deventry, *devtest;
NodeRegion *region;
@@ -3597,6 +3595,7 @@ extTermAPFunc(tile, pNum, eapd)
int pNum; /* Plane of tile (unused, set to -1) */
ExtAreaPerimData *eapd; /* Area and perimeter totals for terminal */
{
ARG_UNUSED(pNum);
TileType type;
Tile *tp;
Rect r;
@@ -3694,7 +3693,7 @@ extTransPerimFunc(bp)
Tile *tile;
NodeRegion *diffNode = (NodeRegion *) extGetRegion(bp->b_outside);
ExtDevice *devptr, *deventry;
int i, area, perim, len = BoundaryLength(bp);
int i, len = BoundaryLength(bp);
int thisterm;
LabelList *ll;
Label *lab;
@@ -4867,6 +4866,7 @@ int
extSubsFunc3(tile)
Tile *tile;
{
ARG_UNUSED(tile);
/* Stops the search because something that was not space was found */
return 1;
}
extract/ExtCouple.c
+3 -11
View File
@@ -494,11 +494,6 @@ extAddOverlap(tbelow, ecpls)
int ob = ExtCurStyle->exts_planeOrder[ecpls->plane_checked];
if (oa > ob)
{
Tile *tp;
TileType t, tres;
TileTypeBitMask *mask;
int len;
CapValue cp;
/*
* Subtract the substrate capacitance from tabove's region due to
* the area of the overlap, minus any shielded area. The shielded
@@ -809,8 +804,6 @@ extAddCouple(bp, ecs)
extCapStruct *ecs;
{
TileType tin = TiGetType(bp->b_inside), tout = TiGetType(bp->b_outside);
int pNum;
PlaneMask pMask;
Boundary bpCopy;
Rect r, ovr;
extSidewallStruct esws;
@@ -928,7 +921,7 @@ extRemoveSubcap(bp, clip, esws)
extSidewallStruct *esws; /* Overlapping edge and plane information */
{
int dnear, length;
double snear, cfrac;
double snear;
NodeRegion *rbp;
TileType ta, tb;
float mult;
@@ -1000,6 +993,7 @@ extFindOverlap(tp, area, esws)
Rect *area; /* Area to check for coupling */
extSidewallStruct *esws; /* Overlapping edge and plane information */
{
ARG_UNUSED(tp);
PlaneMask pMask;
int pNum;
Rect *rsave;
@@ -1063,12 +1057,11 @@ extSideOverlapHalo(tp, esws)
NodeRegion *rtp = (NodeRegion *) extGetRegion(tp);
NodeRegion *rbp = (NodeRegion *) extGetRegion(bp->b_inside);
TileType ta, tb;
Rect tpr;
struct sideoverlap sov;
HashEntry *he;
EdgeCap *e;
int length;
double cfrac, sfrac, afrac, mult, efflength;
double cfrac, sfrac, mult, efflength;
CapValue cap, subcap;
CoupleKey ck;
int dfar, dnear;
@@ -1290,7 +1283,6 @@ extSideOverlap(tp, esws)
NodeRegion *rtp = (NodeRegion *) extGetRegion(tp);
NodeRegion *rbp = (NodeRegion *) extGetRegion(bp->b_inside);
TileType ta, tb;
Rect tpr;
struct overlap ov;
HashEntry *he;
EdgeCap *e;
extract/ExtHard.c
-1
View File
@@ -426,7 +426,6 @@ extHardGenerateLabel(scx, reg, arg)
char gen[100];
int len;
Rect r;
Point p;
extMakeNodeNumPrint(gen, (LabRegion *)reg);
extract/ExtHier.c
+3 -2
View File
@@ -72,6 +72,7 @@ int
extHierSubShieldFunc(tile)
Tile *tile;
{
ARG_UNUSED(tile);
return 1;
}
@@ -333,9 +334,8 @@ extHierConnectFunc1(oneTile, ha)
Rect r;
TileTypeBitMask mask, *connected;
TileType rtype;
Label *lab, *newlab;
Label *lab;
int i;
unsigned n;
/*
* Find all tiles that connect to 'srcTile', but in the
@@ -950,6 +950,7 @@ extHierLabFirst(tile, arg)
Tile *tile;
FindRegion *arg;
{
ARG_UNUSED(tile);
LabRegion *new;
new = (LabRegion *) mallocMagic((unsigned) (sizeof (LabRegion)));
extract/ExtMain.c
+3
View File
@@ -189,6 +189,7 @@ extIsUsedFunc(use, clientData)
CellUse *use;
ClientData clientData; /* unused */
{
ARG_UNUSED(clientData);
CellDef *def = use->cu_def;
/* If any cell is not marked CDDONTUSE then return 1 and stop the search. */
@@ -213,6 +214,8 @@ extEnumFunc(tile, plane)
Tile *tile;
int *plane;
{
ARG_UNUSED(tile);
ARG_UNUSED(plane);
return 1;
}
extract/ExtRegion.c
-1
View File
@@ -214,7 +214,6 @@ ExtLabelRegions(def, connTo, nodeList, clipArea)
int quad, pNum, n, nclasses;
Point p;
bool found;
TileType extSubType = 0;
LabelList *retList = NULL;
for (lab = def->cd_labels; lab; lab = lab->lab_next)
extract/ExtSubtree.c
+3 -2
View File
@@ -117,6 +117,7 @@ extClearUseFlags(use, clientData)
CellUse *use;
ClientData clientData;
{
ARG_UNUSED(clientData);
use->cu_flags &= ~CU_SUB_EXTRACTED;
return 0;
}
@@ -436,7 +437,6 @@ extSubtreeInteraction(ha)
{
CellDef *oneDef, *cumDef = ha->ha_cumFlat.et_use->cu_def;
ExtTree *oneFlat, *nextFlat;
NodeRegion *reg;
SearchContext scx;
scx.scx_trans = GeoIdentityTransform;
@@ -717,6 +717,8 @@ extFoundProc(tile, clientData)
Tile *tile;
ClientData clientData;
{
ARG_UNUSED(tile);
ARG_UNUSED(clientData);
return 1;
}
@@ -1056,7 +1058,6 @@ extSubtreeTileToNode(tp, pNum, et, ha, doHard)
"Cannot find the name of this node (probable extractor error)";
CellDef *parentDef = ha->ha_parentUse->cu_def;
LabRegion *reg;
Label *lab;
Rect r;
TileType ttype;
extract/ExtTech.c
+2 -10
View File
@@ -18,9 +18,6 @@
* *********************************************************************
*/
#ifndef lint
static char sccsid[] = "@(#)ExtTech.c 4.8 MAGIC (Berkeley) 10/26/85";
#endif /* not lint */
#include <stdio.h>
#include <stdlib.h> /* for strtod() */
@@ -543,7 +540,6 @@ int
ExtGetDiffTypesMask(mask)
TileTypeBitMask *mask;
{
TileType ttype;
if (ExtCurStyle == NULL) return 1;
@@ -808,7 +804,6 @@ ExtStyle *
extTechStyleAlloc()
{
ExtStyle *style;
TileType r;
style = (ExtStyle *) mallocMagic(sizeof (ExtStyle));
return style;
@@ -1112,7 +1107,6 @@ void
ExtTechInit()
{
ExtKeep *style;
int r;
/* Delete everything in ExtCurStyle */
@@ -1177,7 +1171,6 @@ ExtTechSimpleAreaCap(argc, argv)
TileType s, t;
TileTypeBitMask types, subtypes, shields;
CapValue capVal;
float multVal;
int plane1, plane2, plane3, pnum1, pnum2, pnum3;
PlaneMask pshield;
@@ -1969,7 +1962,8 @@ ExtTechLine(sectionName, argc, argv)
int argc;
char *argv[];
{
int n, l, i, j, size, val, p1, p2, p3, nterm, iterm, class;
ARG_UNUSED(sectionName);
int n, l, i, j, val, p1, p2, p3, nterm, iterm, class;
PlaneMask pshield, pov;
CapValue capVal, gscap, gccap;
ResValue resVal;
@@ -1983,7 +1977,6 @@ ExtTechLine(sectionName, argc, argv)
ExtKeep *es, *newStyle;
ParamList *subcktParams, *newParam;
ExtDevice *devptr;
int refcnt;
int offset;
double dhalo;
double doffset;
@@ -3479,7 +3472,6 @@ diffplane:
void
ExtTechFinal()
{
ExtStyle *es;
TileType s, t;
/* Create a "default" style if there isn't one */
extract/ExtTest.c
-1
View File
@@ -118,7 +118,6 @@ ExtractTest(w, cmd)
int n, halo, bloat;
CellUse *selectedCell;
Rect editArea;
char *addr, *name;
typedef enum { CLRDEBUG, CLRLENGTH, DRIVER, DUMP, INTERACTIONS,
INTERCOUNT, EXTPARENTS, RECEIVER, SETDEBUG, SHOWDEBUG,
SHOWPARENTS, SHOWTECH, STATS, STEP, TIME } cmdType;
extract/ExtTimes.c
+3 -1
View File
@@ -400,6 +400,7 @@ extCountTiles(tile, cs)
Tile *tile; /* UNUSED */
struct cellStats *cs;
{
ARG_UNUSED(tile);
cs->cs_rects++;
return (0);
}
@@ -783,7 +784,8 @@ extTimeProc(proc, def, tv)
CellDef *def;
struct timeval *tv;
{
int secs, usecs, i;
ARG_UNUSED(proc);
ARG_UNUSED(def);
#if defined(SYSV) || defined(EMSCRIPTEN)
tv->tv_sec = 0;
garouter/gaMaze.c
+1
View File
@@ -201,6 +201,7 @@ gaMazeRoute(
* route is possible.
*/
{
ARG_UNUSED(side);
TileTypeBitMask pinLayerMask = *pinLayerMaskp; // TTMaskCopy(&pinLayerMask, pinLayerMaskp);
Rect routeBounds;
bool done = FALSE;
garouter/gaSimple.c
+2
View File
@@ -576,6 +576,8 @@ gaIsClearFunc(tile, cxp)
Tile *tile;
TreeContext *cxp;
{
ARG_UNUSED(tile);
ARG_UNUSED(cxp);
return 1;
}
garouter/gaTest.c
+1
View File
@@ -91,6 +91,7 @@ GATest(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
ARG_UNUSED(w);
int n;
typedef enum { CLRDEBUG, SETDEBUG, SHOWDEBUG} cmdType;
static const struct
gcr/gcrDebug.c
-2
View File
@@ -73,9 +73,7 @@ GCRRouteFromFile(fname)
static Point initOrigin = { 0, 0 };
struct tms tbuf1, tbuf2;
GCRChannel *ch;
Transform trans;
FILE *fp;
Rect box;
fp = fopen(fname, "r");
if (fp == NULL)
graphics/W3Dmain.c
+5 -10
View File
@@ -645,8 +645,8 @@ w3dHelp(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
ARG_UNUSED(w);
const char * const *msg;
W3DclientRec *crec = (W3DclientRec *) w->w_clientData;
if (cmd->tx_argc == 1)
{
@@ -676,9 +676,6 @@ w3dCutBox(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
bool hide = FALSE;
int lidx = 1, num_layers;
TileTypeBitMask mask;
W3DclientRec *crec = (W3DclientRec *) w->w_clientData;
if (cmd->tx_argc == 1 || cmd->tx_argc == 2 || cmd->tx_argc == 5)
@@ -759,7 +756,7 @@ w3dSeeLayers(w, cmd)
TxCommand *cmd;
{
bool hide = FALSE;
int lidx = 1, num_layers;
int lidx = 1;
TileTypeBitMask mask;
W3DclientRec *crec = (W3DclientRec *) w->w_clientData;
@@ -811,7 +808,6 @@ w3dClose(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
W3DclientRec *crec = (W3DclientRec *) w->w_clientData;
if (cmd->tx_argc == 1)
(void) WindDelete(w);
@@ -988,7 +984,6 @@ w3dRefresh(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
W3DclientRec *crec = (W3DclientRec *) w->w_clientData;
if (cmd->tx_argc == 1)
w3drefreshFunc(w);
@@ -1236,7 +1231,6 @@ w3dRenderValues(w, cmd)
{
int lidx;
CIFLayer *layer;
W3DclientRec *crec = (W3DclientRec *) w->w_clientData;
if (cmd->tx_argc > 1)
{
@@ -1638,6 +1632,7 @@ W3Dredisplay(w, rootArea, clipArea)
Rect *rootArea; /* Ignore this---area defined by window with box */
Rect *clipArea; /* Ignore this, too */
{
ARG_UNUSED(clipArea);
W3DclientRec *crec;
CellDef *cellDef;
SearchContext scontext;
@@ -1715,12 +1710,13 @@ W3DCIFredisplay(w, rootArea, clipArea)
Rect *rootArea; /* Ignore this---area defined by window with box */
Rect *clipArea; /* Ignore this, too */
{
ARG_UNUSED(rootArea);
ARG_UNUSED(clipArea);
W3DclientRec *crec;
SearchContext scx;
CellDef *cellDef;
Rect clipRect;
int i;
TileTypeBitMask *mask;
w3dLock(w);
@@ -1791,7 +1787,6 @@ W3Dcommand(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
int cmdNum;
switch (cmd->tx_button)
{
graphics/grClip.c
+1 -2
View File
@@ -577,7 +577,6 @@ GrBoxOutline(tile, tilesegs)
{
Rect rect;
TileType ttype;
LinkedRect *curseg;
Tile *tpleft, *tpright, *tptop, *tpbot;
int edgeTop, edgeBot, edgeRight, edgeLeft;
int isolate = 0;
@@ -776,7 +775,7 @@ void
GrBox(MagWindow *mw, Transform *trans, Tile *tile)
{
Rect r, r2, clipr;
bool needClip, needObscure, simpleBox;
bool needClip, needObscure;
LinkedRect *ob, *tilesegs, *segptr;
Point polyp[5];
int np;
graphics/grDStyle.c
+1 -2
View File
@@ -205,7 +205,7 @@ styleBuildDisplayStyle(line, version)
int ord = 1, mask, color, outline, nfill, stipple;
char shortName, longName[52];
char fill[42], ordstr[12], colorName[30];
dstylelink *newstyle, *sstyle;
dstylelink *newstyle;
char v6scanline[] = "%10s %o %29s %o %40s %d %c %50s";
char v7scanline[] = "%10s %i %29s %i %40s %d %c %50s";
@@ -482,7 +482,6 @@ char *libPath;
}
else if (strcmp(sectionName, "display_styles") == 0)
{
int locbitplanes;
if ((processed & (LAYOUT_STYLES | PALE_STYLES)) != 0)
{
graphics/grNull.c
+6
View File
@@ -152,6 +152,7 @@ NullTextSize(text, size, r)
int size;
Rect *r;
{
ARG_UNUSED(size);
ASSERT(r != NULL, "nullTextSize");
r->r_xbot = 0;
r->r_xtop = strlen(text);
@@ -182,6 +183,8 @@ nullStdin(
int fd,
ClientData cdata) /* notused */
{
ARG_UNUSED(fd);
ARG_UNUSED(cdata);
int ch;
TxInputEvent *event;
@@ -245,6 +248,9 @@ nullSetDisplay(dispType, outFileName, mouseFileName)
char *outFileName;
char *mouseFileName;
{
ARG_UNUSED(dispType);
ARG_UNUSED(outFileName);
ARG_UNUSED(mouseFileName);
TxPrintf("Using NULL graphics device.\n");
TxAdd1InputDevice(fileno(stdin), nullStdin, (ClientData) NULL);
graphics/grTCairo1.c
+8 -11
View File
@@ -150,6 +150,7 @@ void
grtcairoSetLineStyle (style)
int style; /* New stipple pattern for lines. */
{
ARG_UNUSED(style);
// unimplemented for cairo
}
@@ -259,7 +260,6 @@ int stipple; /* The stipple number to be used. */
bool
GrTCairoInit ()
{
bool rstatus;
if (Tk_InitStubs(magicinterp, Tclmagic_InitStubsVersion, 0) == NULL) return FALSE;
@@ -414,6 +414,8 @@ void
tcairoSetProjection(llx, lly, width, height)
int llx, lly, width, height;
{
ARG_UNUSED(llx);
ARG_UNUSED(lly);
TCairoData *tcairodata = (TCairoData *)tcairoCurrent.mw->w_grdata2;
bool offscreen = FALSE;
@@ -486,10 +488,8 @@ TCairoEventProc(clientData, xevent)
ClientData clientData;
XEvent *xevent;
{
TxInputEvent *event;
HashEntry *entry;
Tk_Window tkwind = (Tk_Window)clientData;
Window wind;
MagWindow *mw;
unsigned char LocRedirect = TxInputRedirect;
@@ -548,7 +548,7 @@ XEvent *xevent;
{
int keywstate, keymod, idx, idxmax;
char inChar[10];
Tcl_Channel outChannel = Tcl_GetStdChannel(TCL_STDOUT);
Tcl_GetStdChannel(TCL_STDOUT);
nbytes = XLookupString(KeyPressedEvent, inChar, sizeof(inChar),
&keysym, NULL);
@@ -829,7 +829,7 @@ keys_and_buttons:
XConfigureEvent *ConfigureEvent = (XConfigureEvent*) xevent;
Rect screenRect;
int width, height;
bool result, need_resize;
bool need_resize;
width = ConfigureEvent->width;
height = ConfigureEvent->height;
@@ -981,9 +981,9 @@ char *dispType;
char *outFileName;
char *mouseFileName;
{
char *planecount;
char *fullname;
FILE* f;
ARG_UNUSED(dispType);
ARG_UNUSED(outFileName);
ARG_UNUSED(mouseFileName);
bool execFailed = FALSE;
int x, y, width, height;
@@ -1097,7 +1097,6 @@ char *name;
int y = grTransYs(w->w_frameArea.r_ytop);
int width = w->w_frameArea.r_xtop - w->w_frameArea.r_xbot;
int height = w->w_frameArea.r_ytop - w->w_frameArea.r_ybot;
unsigned long attribmask = CWBackPixel | CWBorderPixel | CWColormap;
XSetWindowAttributes grAttributes;
WindSeparateRedisplay(w);
@@ -1158,7 +1157,6 @@ char *name;
if (tkwind != 0)
{
bool result;
TCairoData *tcairodata;
GrTCairoFlush();
@@ -1384,7 +1382,6 @@ GrTCairoLock(w, flag)
MagWindow *w;
bool flag;
{
Window wind;
grSimpleLock(w, flag);
if ( w != GR_LOCK_SCREEN )
graphics/grTCairo3.c
+12 -8
View File
@@ -63,6 +63,7 @@ Rect *prect; /* A rectangle that forms the template
int outline; /* the outline style */
Rect *clip; /* a clipping rectangle */
{
ARG_UNUSED(outline);
int xsize, ysize;
int x, y;
int xstart, ystart;
@@ -188,9 +189,9 @@ char *text;
int size;
Rect *r;
{
ARG_UNUSED(size);
TCairoData *tcairodata;
cairo_text_extents_t extents;
int width;
/* Note: size is ignored, as it is passed the current value; */
/* but the font size in cairo has already been set. */
@@ -233,7 +234,6 @@ grtcairoCreateBackingStore(MagWindow *w)
Tk_Window tkwind = (Tk_Window)w->w_grdata;
Window wind;
unsigned int width, height;
GC gc;
XGCValues gcValues;
int grDepth;
@@ -433,6 +433,9 @@ GrTCairoReadPixel (w, x, y)
MagWindow *w;
int x, y; /* the location of a pixel in screen coords */
{
ARG_UNUSED(w);
ARG_UNUSED(x);
ARG_UNUSED(y);
return 0; /* (unimplemented) */
}
@@ -456,6 +459,8 @@ GrTCairoBitBlt(r, p)
Rect *r;
Point *p;
{
ARG_UNUSED(r);
ARG_UNUSED(p);
// (unimplemented)
}
@@ -474,10 +479,10 @@ FontChar *clist;
unsigned char tc;
int pixsize;
{
ARG_UNUSED(tc);
Point *tp;
int np, nptotal;
int np;
int i;
static int maxnp = 0;
FontChar *ccur;
TCairoData *tcairodata = (TCairoData *)tcairoCurrent.mw->w_grdata2;
@@ -520,13 +525,14 @@ Point *pos; /* Text base position */
Rect *clip; /* Clipping area */
LinkedRect *obscure; /* List of obscuring areas */
{
ARG_UNUSED(clip);
ARG_UNUSED(obscure);
char *tptr;
Point *coffset; /* vector to next character */
Rect *cbbox;
float fsize;
FontChar *clist;
int cheight, baseline;
float tmp;
int baseline;
TCairoData *tcairodata = (TCairoData *)tcairoCurrent.mw->w_grdata2;
cairo_save(tcairodata->context);
@@ -595,8 +601,6 @@ LinkedRect *obscure; /* A list of obscuring rectangles */
Rect textrect;
LinkedRect *ob;
void grTCairoGeoSub();
int i;
float tscale;
TCairoData *tcairodata = (TCairoData *)tcairoCurrent.mw->w_grdata2;
if (GrTCairoTextSize(text, tcairoCurrent.fontSize, &textrect) < 0) return;
graphics/grTOGL1.c
+5 -11
View File
@@ -262,7 +262,6 @@ grtoglSetStipple (stipple)
bool
GrTOGLInit ()
{
bool rstatus;
#ifdef THREE_D
static int attributeList[] = { GLX_RGBA, GLX_DOUBLEBUFFER, None };
#else
@@ -490,10 +489,8 @@ TOGLEventProc(clientData, xevent)
ClientData clientData;
XEvent *xevent;
{
TxInputEvent *event;
HashEntry *entry;
Tk_Window tkwind = (Tk_Window)clientData;
Window wind;
MagWindow *mw;
unsigned char LocRedirect = TxInputRedirect;
@@ -552,7 +549,7 @@ TOGLEventProc(clientData, xevent)
{
int keywstate, keymod, idx, idxmax;
char inChar[10];
Tcl_Channel outChannel = Tcl_GetStdChannel(TCL_STDOUT);
Tcl_GetStdChannel(TCL_STDOUT);
nbytes = XLookupString(KeyPressedEvent, inChar, sizeof(inChar),
&keysym, NULL);
@@ -833,7 +830,7 @@ keys_and_buttons:
XConfigureEvent *ConfigureEvent = (XConfigureEvent*) xevent;
Rect screenRect;
int width, height;
bool result, need_resize;
bool need_resize;
width = ConfigureEvent->width;
height = ConfigureEvent->height;
@@ -973,9 +970,9 @@ oglSetDisplay (dispType, outFileName, mouseFileName)
char *outFileName;
char *mouseFileName;
{
char *planecount;
char *fullname;
FILE* f;
ARG_UNUSED(dispType);
ARG_UNUSED(outFileName);
ARG_UNUSED(mouseFileName);
bool execFailed = FALSE;
int x, y, width, height;
@@ -1098,7 +1095,6 @@ GrTOGLCreate(w, name)
int y = glTransYs(w->w_frameArea.r_ytop);
int width = w->w_frameArea.r_xtop - w->w_frameArea.r_xbot;
int height = w->w_frameArea.r_ytop - w->w_frameArea.r_ybot;
unsigned long attribmask = CWBackPixel | CWBorderPixel | CWColormap;
XSetWindowAttributes grAttributes;
WindSeparateRedisplay(w);
@@ -1158,7 +1154,6 @@ GrTOGLCreate(w, name)
if (tkwind != 0)
{
bool result;
GrTOGLFlush();
@@ -1358,7 +1353,6 @@ GrTOGLLock(w, flag)
MagWindow *w;
bool flag;
{
Window wind;
#ifdef CAIRO_OFFSCREEN_RENDER
/* Use Cairo graphics for off-screen rendering */
graphics/grTOGL3.c
+10 -7
View File
@@ -339,7 +339,6 @@ bool
grtoglScrollBackingStore(MagWindow *w, Point *shift)
{
RenderFrame *rf;
GLuint FramebufferName, RenderbufferName;
unsigned int width, height;
int xorigin, yorigin, xshift, yshift;
@@ -399,7 +398,6 @@ void
grtoglPutBackingStore(MagWindow *w, Rect *area)
{
RenderFrame *rf;
GLuint FramebufferName, RenderbufferName;
unsigned int width, height;
int ybot, xbot;
Rect r;
@@ -456,6 +454,9 @@ GrTOGLReadPixel (w, x, y)
MagWindow *w;
int x,y; /* the location of a pixel in screen coords */
{
ARG_UNUSED(w);
ARG_UNUSED(x);
ARG_UNUSED(y);
return 0; /* OpenGL has no such function, so return 0 */
}
@@ -479,6 +480,7 @@ GrTOGLBitBlt(r, p)
Rect *r;
Point *p;
{
ARG_UNUSED(p);
glCopyPixels(r->r_xbot, r->r_ybot, r->r_xtop - r->r_xbot + 1,
r->r_ytop - r->r_ybot + 1, GL_COLOR);
}
@@ -498,6 +500,8 @@ void
myCombine(GLdouble coords[3], GLdouble *vertex_data[4],
GLfloat weight[4], GLdouble **outData, void *dataptr)
{
ARG_UNUSED(vertex_data);
ARG_UNUSED(weight);
/* This needs to be free'd at the end of gluTessEndPolygon()! */
GLdouble *new = (GLdouble *)mallocMagic(2 * sizeof(GLdouble));
new[0] = coords[0];
@@ -605,13 +609,14 @@ grtoglFontText(text, font, size, rotate, pos, clip, obscure)
Rect *clip; /* Clipping area */
LinkedRect *obscure; /* List of obscuring areas */
{
ARG_UNUSED(clip);
ARG_UNUSED(obscure);
char *tptr;
Point *coffset; /* vector to next character */
Rect *cbbox;
GLfloat fsize, matvals[16];
GLfloat fsize;
FontChar *clist;
int cheight, baseline;
float tmp;
int baseline;
/* Keep it simple for now---ignore clip and obscure */
@@ -680,8 +685,6 @@ grtoglPutText (text, pos, clip, obscure)
Rect textrect;
LinkedRect *ob;
void grTOGLGeoSub();
int i;
float tscale;
if (GrTOGLTextSize(text, toglCurrent.fontSize, &textrect) < 0) return;
graphics/grText.c
-1
View File
@@ -57,7 +57,6 @@ GrFontText(str, style, p, font, size, rotate, clip)
Rect *clip; /* Clipping area */
{
Rect nClip;
Point pstart;
/* Fall back on X11 text if vectored text unavailable */
if (!grFontTextPtr)
graphics/grTk1.c
+4 -7
View File
@@ -350,7 +350,7 @@ GrTkInit(dispType)
char *dispType;
{
int i,j;
XVisualInfo grvisual_info, *grvisual_get, grtemplate;
XVisualInfo *grvisual_get, grtemplate;
VisualID defpsvid;
int defpsindex = -1;
int gritems, gritems_list, grcolorCount;
@@ -677,7 +677,6 @@ GrTkInit(dispType)
void
GrTkClose ()
{
int i;
if (grXdpy == NULL) return;
@@ -795,7 +794,7 @@ MagicEventProc(clientData, xevent)
{
int keywstate, keymod, idx, idxmax;
char inChar[10];
Tcl_Channel outChannel = Tcl_GetStdChannel(TCL_STDOUT);
Tcl_GetStdChannel(TCL_STDOUT);
nbytes = XLookupString(KeyPressedEvent, inChar, sizeof(inChar),
&keysym, NULL);
@@ -1212,9 +1211,8 @@ x11SetDisplay (dispType, outFileName, mouseFileName)
char *outFileName;
char *mouseFileName;
{
char *planecount;
char *fullname;
FILE* f;
ARG_UNUSED(outFileName);
ARG_UNUSED(mouseFileName);
bool execFailed = FALSE;
int x, y, width, height;
@@ -1716,7 +1714,6 @@ GrTkUnlock(w)
bool
GrTkEventPending()
{
Tk_Window tkwind = grCurrent.window;
Window wind = grCurrent.windowid;
XEvent genEvent;
bool retval;
graphics/grTk3.c
+5 -2
View File
@@ -237,6 +237,7 @@ GrTkReadPixel (w, x, y)
MagWindow *w;
int x,y; /* the location of a pixel in screen coords */
{
ARG_UNUSED(w);
XImage *image;
unsigned long value;
XWindowAttributes att;
@@ -325,11 +326,13 @@ grtkFontText(text, font, size, rotate, pos, clip, obscure)
Rect *clip;
LinkedRect *obscure;
{
ARG_UNUSED(clip);
ARG_UNUSED(obscure);
char *tptr;
FontChar *ccur, *clist;
Point *coffset, *tp, loffset, locoffset, corners[4], lpos;
Point *coffset, *tp, loffset, locoffset, lpos;
Rect *cbbox, charbbox, *frect;
int np, i, j, w, h, llx, lly, baseline;
int np, i, j, w, h, baseline;
XPoint *xp;
Pixmap pxm;
double fscale, scx, scy, tmpx, tmpy, rrad, cr, sr;
graphics/grTkCommon.c
+2 -1
View File
@@ -304,7 +304,6 @@ GrTkWindowName(mw)
MagWindow *mw;
{
Tk_Window tkwind;
char *tkname;
tkwind = (Tk_Window) mw->w_grdata;
return Tk_PathName(tkwind);
@@ -677,6 +676,7 @@ static int
_magic_magiccolor(ClientData clientData,
Tcl_Interp *interp, int argc, char *argv[])
{
ARG_UNUSED(clientData);
char *result;
char *name;
@@ -847,6 +847,7 @@ ImgLayerCreate(interp, name, argc, argv, typePtr, master, clientDataPtr)
ClientData *clientDataPtr; /* Store manager's token for image here;
* it will be returned in later callbacks. */
{
ARG_UNUSED(typePtr);
LayerMaster *masterPtr;
masterPtr = (LayerMaster *) Tcl_Alloc(sizeof(LayerMaster));
grouter/grouteCrss.c
+1
View File
@@ -577,6 +577,7 @@ glCrossChoose(newRest, tp, pin, newPath)
GCRPin *pin; /* Pin on boundary of tp being considered */
GlPoint *newPath; /* Update newPath->gl_pin, newPath->gl_cost */
{
ARG_UNUSED(tp);
GCRPin *savePin;
int cost;

Some files were not shown because too many files have changed in this diff Show More