From d01868b7252afbce3e90c9be169b22449734deb9 Mon Sep 17 00:00:00 2001 From: Brian Taylor Date: Wed, 19 Jun 2024 15:06:20 -0700 Subject: [PATCH] Cleanup gcc compiler warnings. --- src/frontend/inpcom.c | 4 ++-- src/maths/ni/niconv.c | 2 +- src/xspice/icm/digital/adc_bridge/cfunc.mod | 2 ++ src/xspice/icm/digital/dac_bridge/cfunc.mod | 4 ++++ src/xspice/icm/xtraevt/real_to_v/cfunc.mod | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 481f2f34e..2a29d5eef 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -1489,7 +1489,7 @@ static struct inp_read_t inp_read(FILE* fp, int call_depth, const char* dir_name end, copy(buffer), line_number, end->linenum_orig, end->linesource); else end = insert_new_line( - end, copy(buffer), line_number, 1, file_name); + end, copy(buffer), line_number, 1, (char *)file_name); if (!cc) cc = end; @@ -6692,7 +6692,7 @@ static void inp_compat(struct card *card) *curr_line = '*'; for (i = 0; i < tokcount - 1; i++) for (ii = i + 1; ii < tokcount; ii++) { - char* newline = tprintf("%s_%d_%d %s %s %s", kinst, i + 1, ii + 1, ltok[i], ltok[ii], couple); + char* newline = tprintf("%s_%d_%d %s %s %s", kinst, (int)i + 1, (int)ii + 1, ltok[i], ltok[ii], couple); card = insert_new_line(card, newline, (int)i + 1, currlinenumber, card->linesource); } tfree(kinst); diff --git a/src/maths/ni/niconv.c b/src/maths/ni/niconv.c index 519f039d3..5d24a23bf 100644 --- a/src/maths/ni/niconv.c +++ b/src/maths/ni/niconv.c @@ -47,7 +47,7 @@ NIconvTest(CKTcircuit *ckt) nancount++; } else if (ft_ngdebug && nancount == 10) { - fprintf(stderr, " non-convergence warnings (nan) limited to 10\n", CKTnodName(ckt, i)); + fprintf(stderr, " non-convergence warnings (nan) limited to 10 node %s\n", CKTnodName(ckt, i)); nancount++; } return 1; diff --git a/src/xspice/icm/digital/adc_bridge/cfunc.mod b/src/xspice/icm/digital/adc_bridge/cfunc.mod index c376d871b..f8fab954d 100644 --- a/src/xspice/icm/digital/adc_bridge/cfunc.mod +++ b/src/xspice/icm/digital/adc_bridge/cfunc.mod @@ -334,6 +334,8 @@ void cm_adc_bridge(ARGS) OUTPUT_STRENGTH(out[i]) = STRONG; } break; + default: + break; } } else { /*** TIME == 0.0 => set outputs to input value... ***/ diff --git a/src/xspice/icm/digital/dac_bridge/cfunc.mod b/src/xspice/icm/digital/dac_bridge/cfunc.mod index 6f4a931be..ae3a34b07 100644 --- a/src/xspice/icm/digital/dac_bridge/cfunc.mod +++ b/src/xspice/icm/digital/dac_bridge/cfunc.mod @@ -416,5 +416,9 @@ void cm_dac_bridge(ARGS) } OUTPUT(out[i]) = out[i]; } + break; + + default: + break; } } diff --git a/src/xspice/icm/xtraevt/real_to_v/cfunc.mod b/src/xspice/icm/xtraevt/real_to_v/cfunc.mod index 112c91877..6abfe3a71 100644 --- a/src/xspice/icm/xtraevt/real_to_v/cfunc.mod +++ b/src/xspice/icm/xtraevt/real_to_v/cfunc.mod @@ -68,6 +68,8 @@ void ucm_real_to_v (ARGS) } break; + default: + break; } }