Browse Source

Cleanup gcc compiler warnings.

pre-master-46
Brian Taylor 2 years ago
committed by Holger Vogt
parent
commit
d01868b725
  1. 4
      src/frontend/inpcom.c
  2. 2
      src/maths/ni/niconv.c
  3. 2
      src/xspice/icm/digital/adc_bridge/cfunc.mod
  4. 4
      src/xspice/icm/digital/dac_bridge/cfunc.mod
  5. 2
      src/xspice/icm/xtraevt/real_to_v/cfunc.mod

4
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); end, copy(buffer), line_number, end->linenum_orig, end->linesource);
else else
end = insert_new_line( end = insert_new_line(
end, copy(buffer), line_number, 1, file_name);
end, copy(buffer), line_number, 1, (char *)file_name);
if (!cc) if (!cc)
cc = end; cc = end;
@ -6692,7 +6692,7 @@ static void inp_compat(struct card *card)
*curr_line = '*'; *curr_line = '*';
for (i = 0; i < tokcount - 1; i++) for (i = 0; i < tokcount - 1; i++)
for (ii = i + 1; ii < tokcount; ii++) { 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); card = insert_new_line(card, newline, (int)i + 1, currlinenumber, card->linesource);
} }
tfree(kinst); tfree(kinst);

2
src/maths/ni/niconv.c

@ -47,7 +47,7 @@ NIconvTest(CKTcircuit *ckt)
nancount++; nancount++;
} }
else if (ft_ngdebug && nancount == 10) { 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++; nancount++;
} }
return 1; return 1;

2
src/xspice/icm/digital/adc_bridge/cfunc.mod

@ -334,6 +334,8 @@ void cm_adc_bridge(ARGS)
OUTPUT_STRENGTH(out[i]) = STRONG; OUTPUT_STRENGTH(out[i]) = STRONG;
} }
break; break;
default:
break;
} }
} }
else { /*** TIME == 0.0 => set outputs to input value... ***/ else { /*** TIME == 0.0 => set outputs to input value... ***/

4
src/xspice/icm/digital/dac_bridge/cfunc.mod

@ -416,5 +416,9 @@ void cm_dac_bridge(ARGS)
} }
OUTPUT(out[i]) = out[i]; OUTPUT(out[i]) = out[i];
} }
break;
default:
break;
} }
} }

2
src/xspice/icm/xtraevt/real_to_v/cfunc.mod

@ -68,6 +68,8 @@ void ucm_real_to_v (ARGS)
} }
break; break;
default:
break;
} }
} }

Loading…
Cancel
Save