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

gcc11 -Wall -Wpedantic cleanup (post __attribute__)

This commit is contained in:
Darryl L. Miles 2025-01-06 16:25:38 +00:00
parent 48c99a7b1d
commit 6afadf9809
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cif/CIFrdutils.c
View File

@ -140,7 +140,7 @@ CIFReadError(const char *format, ...)
if (cifLineNumber > 0) if (cifLineNumber > 0)
TxError("Error at line %d of CIF file: ", cifLineNumber); TxError("Error at line %d of CIF file: ", cifLineNumber);
else else
TxError("CIF file read error: ", cifLineNumber); TxError("CIF file read error: ");
va_start(args, format); va_start(args, format);
Vfprintf(stderr, format, args); Vfprintf(stderr, format, args);
va_end(args); va_end(args);

2
database/DBcellsrch.c
View File

@ -1622,7 +1622,7 @@ dbTileScaleFunc(tile, scvals)
(targetRect.r_ytop - targetRect.r_ybot == 0)) (targetRect.r_ytop - targetRect.r_ybot == 0))
{ {
TxPrintf("Tile %p at (%d, %d) has zero area after scaling: Removed.\n", TxPrintf("Tile %p at (%d, %d) has zero area after scaling: Removed.\n",
tile, targetRect.r_xbot, targetRect.r_ybot); (void *) tile, targetRect.r_xbot, targetRect.r_ybot);
return 0; return 0;
} }

2
extract/ExtBasic.c
View File

@ -383,7 +383,7 @@ extBasic(def, outFile)
if (devidx < 0) if (devidx < 0)
{ {
TxError("Extract error: \"device\" property has unknown " TxError("Extract error: \"device\" property has unknown "
"device type.\n", token); "device type: %s\n", token);
propfound = FALSE; propfound = FALSE;
} }
if (propfound) if (propfound)

6
gcr/gcrDebug.c
View File

@ -542,11 +542,11 @@ gcrDumpCol(col, size)
return; return;
for (i = size; i >= 0; i--) for (i = size; i >= 0; i--)
TxPrintf("[%2d] hi=%6d(%c) lo=%6d(%c) h=%6d v=%6d w=%6d f=%4d\n", i, TxPrintf("[%2d] hi=%6d(%c) lo=%6d(%c) h=%6lu v=%6lu w=%6lu f=%4d\n", i,
col[i].gcr_hi, col[i].gcr_hOk ? 'T' : 'F', col[i].gcr_hi, col[i].gcr_hOk ? 'T' : 'F',
col[i].gcr_lo, col[i].gcr_lOk ? 'T' : 'F', col[i].gcr_lo, col[i].gcr_lOk ? 'T' : 'F',
col[i].gcr_h, col[i].gcr_v, (pointertype) col[i].gcr_h, (pointertype) col[i].gcr_v,
col[i].gcr_wanted, col[i].gcr_flags); (pointertype) col[i].gcr_wanted, col[i].gcr_flags);
} }
/* /*

2
lef/defRead.c
View File

@ -348,7 +348,7 @@ DefAddRoutes(rootDef, f, oscale, special, netname, ruleset, defLayerMap, annotat
} }
else if (!strcmp(token, "POLYGON")) else if (!strcmp(token, "POLYGON"))
{ {
LefError(DEF_ERROR, "Route has POLYGON entries, this is not handled!\n", LefError(DEF_ERROR, "Route has %s entries, this is not handled!\n",
token); token);
token = LefNextToken(f, TRUE); /* read opening parens */ token = LefNextToken(f, TRUE); /* read opening parens */
goto endCoord; goto endCoord;

6
plot/plotMain.c
View File

@ -281,7 +281,7 @@ PlotPrintParams()
{ {
TxPrintf("General plotting parameters are:\n"); TxPrintf("General plotting parameters are:\n");
TxPrintf(" showCellNames: %s\n", PlotShowCellNames ? "true" : "false"); TxPrintf(" showCellNames: %s\n", PlotShowCellNames ? "true" : "false");
TxPrintf(""); TxPrintf("\n");
TxPrintf("Postscript plotting parameters are:\n"); TxPrintf("Postscript plotting parameters are:\n");
TxPrintf(" PS_cellIdFont: \"%s\"\n", PlotPSIdFont); TxPrintf(" PS_cellIdFont: \"%s\"\n", PlotPSIdFont);
TxPrintf(" PS_cellNameFont:\"%s\"\n", PlotPSNameFont); TxPrintf(" PS_cellNameFont:\"%s\"\n", PlotPSNameFont);
@ -297,7 +297,7 @@ PlotPrintParams()
TxPrintf(" PS_margin: %d (%.3f in)\n", PlotPSMargin, TxPrintf(" PS_margin: %d (%.3f in)\n", PlotPSMargin,
(float)PlotPSMargin / 72); (float)PlotPSMargin / 72);
TxPrintf(""); TxPrintf("\n");
TxPrintf("PNM plotting parameters are:\n"); TxPrintf("PNM plotting parameters are:\n");
TxPrintf(" pnmmaxmem: %d KB\n", PlotPNMmaxmem); TxPrintf(" pnmmaxmem: %d KB\n", PlotPNMmaxmem);
TxPrintf(" pnmdownsample: %d\n", PlotPNMdownsample); TxPrintf(" pnmdownsample: %d\n", PlotPNMdownsample);
@ -305,7 +305,7 @@ PlotPrintParams()
#ifdef VERSATEC #ifdef VERSATEC
TxPrintf(" pnmplotRTL: %s\n", PlotPNMRTL ? "true" : "false"); TxPrintf(" pnmplotRTL: %s\n", PlotPNMRTL ? "true" : "false");
TxPrintf(""); TxPrintf("\n");
TxPrintf("HP/Versatec plotting parameters are:\n"); TxPrintf("HP/Versatec plotting parameters are:\n");
TxPrintf(" cellIdFont: \"%s\"\n", PlotVersIdFont); TxPrintf(" cellIdFont: \"%s\"\n", PlotVersIdFont);
TxPrintf(" cellNameFont: \"%s\"\n", PlotVersNameFont); TxPrintf(" cellNameFont: \"%s\"\n", PlotVersNameFont);

6
plow/PlowTest.c
View File

@ -336,7 +336,7 @@ PlowTest(w, cmd)
break; break;
case PC_MERGEDOWN: case PC_MERGEDOWN:
tp = TiSrPointNoHint(plane, &editArea.r_ll); tp = TiSrPointNoHint(plane, &editArea.r_ll);
TxPrintf("Merging tile %p below\n", tp); TxPrintf("Merging tile %p below\n", (void *)tp);
TiToRect(tp, &editArea); TiToRect(tp, &editArea);
TiToRect(RT(tp), &area2); TiToRect(RT(tp), &area2);
(void) GeoInclude(&area2, &editArea); (void) GeoInclude(&area2, &editArea);
@ -345,7 +345,7 @@ PlowTest(w, cmd)
break; break;
case PC_MERGEUP: case PC_MERGEUP:
tp = TiSrPointNoHint(plane, &editArea.r_ll); tp = TiSrPointNoHint(plane, &editArea.r_ll);
TxPrintf("Merging tile %p above\n", tp); TxPrintf("Merging tile %p above\n", (void *)tp);
TiToRect(tp, &editArea); TiToRect(tp, &editArea);
TiToRect(RT(tp), &area2); TiToRect(RT(tp), &area2);
(void) GeoInclude(&area2, &editArea); (void) GeoInclude(&area2, &editArea);
@ -355,7 +355,7 @@ PlowTest(w, cmd)
case PC_PRINT: case PC_PRINT:
tp = TiSrPointNoHint(plane, &editArea.r_ll); tp = TiSrPointNoHint(plane, &editArea.r_ll);
TxPrintf("Tile %p LEFT=%d RIGHT=%d BOTTOM=%d TOP=%d\n", TxPrintf("Tile %p LEFT=%d RIGHT=%d BOTTOM=%d TOP=%d\n",
tp, LEFT(tp), RIGHT(tp), BOTTOM(tp), TOP(tp)); (void *)tp, LEFT(tp), RIGHT(tp), BOTTOM(tp), TOP(tp));
TxPrintf(" TRAILING=%d LEADING=%d TYPE=%s\n", TxPrintf(" TRAILING=%d LEADING=%d TYPE=%s\n",
TRAILING(tp), LEADING(tp), DBTypeLongName(TiGetTypeExact(tp))); TRAILING(tp), LEADING(tp), DBTypeLongName(TiGetTypeExact(tp)));
break; break;

4
textio/txCommands.c
View File

@ -201,7 +201,7 @@ void
TxPrintEvent(event) TxPrintEvent(event)
TxInputEvent *event; TxInputEvent *event;
{ {
TxError("Input event at %p\n ", event); TxError("Input event at %p\n ", (void *) event);
if (event->txe_button == TX_EOF) { if (event->txe_button == TX_EOF) {
TxError("EOF event"); TxError("EOF event");
} else if (event->txe_button == TX_BYPASS) { } else if (event->txe_button == TX_BYPASS) {
@ -255,7 +255,7 @@ TxPrintCommand(cmd)
int i, j; int i, j;
char TxTemp[200]; char TxTemp[200];
TxError("Command at %p\n ", cmd); TxError("Command at %p\n ", (void *) cmd);
if (cmd->tx_button == TX_CHARACTER) { if (cmd->tx_button == TX_CHARACTER) {
TxError("Text command with %d words: ", cmd->tx_argc); TxError("Text command with %d words: ", cmd->tx_argc);
for (i = 0; i < cmd->tx_argc; i++) { for (i = 0; i < cmd->tx_argc; i++) {

2
windows/windDebug.c
View File

@ -54,7 +54,7 @@ windPrintWindow(w)
LinkedRect *lr; LinkedRect *lr;
TxPrintf("\nWindow %d: '%s'\n", w->w_wid, w->w_caption); TxPrintf("\nWindow %d: '%s'\n", w->w_wid, w->w_caption);
TxPrintf(" Client %lx Surface %lx \n", w->w_client, CD2INT(w->w_surfaceID)); TxPrintf(" Client %p Surface %lx \n", (void *) w->w_client, CD2INT(w->w_surfaceID));
TxPrintf(" All area (%d, %d) (%d, %d)\n", TxPrintf(" All area (%d, %d) (%d, %d)\n",
w->w_allArea.r_xbot, w->w_allArea.r_ybot, w->w_allArea.r_xbot, w->w_allArea.r_ybot,