From fc20977fa59fe5b412a8fe9f51ec76de5d4122c4 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Sun, 29 Sep 2024 23:00:00 +0100 Subject: [PATCH] gcr/gcrDebug.c: (intmax_t) %ld Wrong type of arguments to formatting function Mutiple items per line. CodeQL: https://github.com/dlmiles/magic/security/code-scanning/87 --- gcr/gcrDebug.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gcr/gcrDebug.c b/gcr/gcrDebug.c index 16a5bbcb..52fc698b 100644 --- a/gcr/gcrDebug.c +++ b/gcr/gcrDebug.c @@ -20,6 +20,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #endif /* not lint */ #include +#include #include #include @@ -454,33 +455,33 @@ gcrDumpPins(ch) TxPrintf("LEFT PINS\n"); for(i=0; i<=ch->gcr_width; i++) { - TxPrintf("Location [%d]=%d: x=%d, y=%d, pNext=%d, pPrev=%d, id=%d\n", - i, &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, - pinArray[i].gcr_pNext, pinArray[i].gcr_pPrev, pinArray[i].gcr_pId); + TxPrintf("Location [%d]=%ld: x=%d, y=%d, pNext=%ld, pPrev=%ld, id=%ld\n", + i, (intmax_t) &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, + (intmax_t) pinArray[i].gcr_pNext, (intmax_t) pinArray[i].gcr_pPrev, (intmax_t) pinArray[i].gcr_pId); } pinArray=ch->gcr_rPins; TxPrintf("RIGHT PINS\n"); for(i=0; i<=ch->gcr_width; i++) { - TxPrintf("Location [%d]=%d: x=%d, y=%d, pNext=%d, pPrev=%d, id=%d\n", - i, &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, - pinArray[i].gcr_pNext, pinArray[i].gcr_pPrev, pinArray[i].gcr_pId); + TxPrintf("Location [%d]=%ld: x=%d, y=%d, pNext=%ld, pPrev=%ld, id=%ld\n", + i, (intmax_t) &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, + (intmax_t) pinArray[i].gcr_pNext, (intmax_t) pinArray[i].gcr_pPrev, (intmax_t) pinArray[i].gcr_pId); } pinArray=ch->gcr_bPins; TxPrintf("BOTTOM PINS\n"); for(i=0; i<=ch->gcr_length; i++) { - TxPrintf("Location [%d]=%d: x=%d, y=%d, pNext=%d, pPrev=%d, id=%d\n", - i, &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, - pinArray[i].gcr_pNext, pinArray[i].gcr_pPrev, pinArray[i].gcr_pId); + TxPrintf("Location [%d]=%ld: x=%d, y=%d, pNext=%ld, pPrev=%ld, id=%ld\n", + i, (intmax_t) &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, + (intmax_t) pinArray[i].gcr_pNext, (intmax_t) pinArray[i].gcr_pPrev, (intmax_t) pinArray[i].gcr_pId); } pinArray=ch->gcr_tPins; TxPrintf("TOP PINS\n"); for(i=0; i<=ch->gcr_length; i++) { - TxPrintf("Location [%d]=%d: x=%d, y=%d, pNext=%d, pPrev=%d, id=%d\n", - i, &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, - pinArray[i].gcr_pNext, pinArray[i].gcr_pPrev, pinArray[i].gcr_pId); + TxPrintf("Location [%d]=%ld: x=%d, y=%d, pNext=%ld, pPrev=%ld, id=%ld\n", + i, (intmax_t) &pinArray[i], pinArray[i].gcr_x, pinArray[i].gcr_y, + (intmax_t) pinArray[i].gcr_pNext, (intmax_t) pinArray[i].gcr_pPrev, (intmax_t) pinArray[i].gcr_pId); } } @@ -507,9 +508,9 @@ gcrDumpPinList(pin, dir) { if (pin) { - TxPrintf("Location (%d, %d)=%x: pNext=%d, pPrev=%d, id=%d\n", - pin->gcr_x, pin->gcr_y, pin, - pin->gcr_pNext, pin->gcr_pPrev, pin->gcr_pId); + TxPrintf("Location (%d, %d)=%lx: pNext=%ld, pPrev=%ld, id=%ld\n", + pin->gcr_x, pin->gcr_y, (intmax_t) pin, + (intmax_t) pin->gcr_pNext, (intmax_t) pin->gcr_pPrev, (intmax_t) pin->gcr_pId); if (dir) gcrDumpPinList(pin->gcr_pNext, dir); else gcrDumpPinList(pin->gcr_pPrev, dir); }