diff --git a/ChangeLog b/ChangeLog index 7eec54ed2..383a1813e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-10-31 Robert Larice + * src/main.c , + * src/frontend/com_fft.c , + * src/frontend/ftesopt.c , + * src/frontend/resource.c , + * src/frontend/numparam/xpressn.c : + swallow warnings + 2011-10-31 Robert Larice * src/spicelib/devices/hisim2/hisim2.h , * src/spicelib/devices/hisim2/hsm2ld.c , diff --git a/src/frontend/com_fft.c b/src/frontend/com_fft.c index 080e5906f..4113f68fb 100644 --- a/src/frontend/com_fft.c +++ b/src/frontend/com_fft.c @@ -432,7 +432,7 @@ com_psd(wordlist *wl) names = names->pn_next; while (vec) { if (vec->v_length != (int)tlen) { - fprintf(cp_err, "Error: lengths of %s vectors don't match: %d, %d\n", + fprintf(cp_err, "Error: lengths of %s vectors don't match: %d, %lu\n", vec->v_name, vec->v_length, tlen); vec = vec->v_link2; continue; @@ -496,8 +496,8 @@ com_psd(wordlist *wl) vec = vec->v_link2; } - printf("PSD: Time span: %g s, input length: %d, zero padding: %d\n", span, size, size-tlen); - printf("PSD: Freq. resolution: %g Hz, output length: %d\n", 1.0/span*tlen/size, fpts); + printf("PSD: Time span: %g s, input length: %lu, zero padding: %lu\n", span, size, size-tlen); + printf("PSD: Freq. resolution: %g Hz, output length: %lu\n", 1.0/span*tlen/size, fpts); sign = 1; isreal = 1; diff --git a/src/frontend/ftesopt.c b/src/frontend/ftesopt.c index c98afd668..d73e00c54 100644 --- a/src/frontend/ftesopt.c +++ b/src/frontend/ftesopt.c @@ -12,21 +12,21 @@ Author: 2010 Paolo Nenzi #include -typedef struct sFTEparm { +struct FTEparm { char *keyword; int id; - char dataType; + enum cp_types dataType; char *description; -} FTEparm; +}; -static FTEparm FTEOPTtbl[] = { +static struct FTEparm FTEOPTtbl[] = { { "decklineno", FTEOPT_NLDECK, CP_NUM, "Number of lines in the deck" }, { "netloadtime", FTEOPT_NLT, CP_REAL, "Netlist loading time" }, { "netparsetime", FTEOPT_NPT, CP_REAL, "Netlist parsing time" } }; -int FTEOPTcount = sizeof(FTEOPTtbl)/sizeof(FTEparm); +static const int FTEOPTcount = sizeof(FTEOPTtbl)/sizeof(*FTEOPTtbl); static struct variable *getFTEstat(struct circ *, int); diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 929d495c7..b5afa22f1 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -2139,10 +2139,10 @@ nupa_subcktcall (tdico * dico, char *s, char *x, bool err) j++; if (t_p[k] > ' ') { - spice_dstring_append(&vstr, "Subckt call, symbol ",-1) ; + spice_dstring_append(&vstr, "Subckt call, symbol ", -1); cadd (&vstr, t_p[k]); sadd (&vstr, " not understood"); - message (dico, spice_dstring_value(&vstr) ) ; + message (dico, "%s", spice_dstring_value(&vstr)); } } diff --git a/src/frontend/resource.c b/src/frontend/resource.c index f762cd00f..f79c94d09 100644 --- a/src/frontend/resource.c +++ b/src/frontend/resource.c @@ -172,9 +172,6 @@ ft_ckspace(void) hi=sbrk(0); usage = (size_t) (hi - enddata); - if (limit < 0) - return; /* what else do you do? */ - if (usage <= old_usage) return; diff --git a/src/main.c b/src/main.c index 41d46376b..2ef7bd5ce 100644 --- a/src/main.c +++ b/src/main.c @@ -168,7 +168,7 @@ struct variable *(*if_getparam)(CKTcircuit *ckt, char **name, char *param, int i /* static functions */ int SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator); -static int sp_shutdown(int exitval); +static void sp_shutdown(int exitval); static void app_rl_readlines(void); #if defined(HAVE_GNUREADLINE) || defined(HAVE_BSDEDITLINE) @@ -475,7 +475,7 @@ SIMinit(IFfrontEnd *frontEnd, IFsimulator **simulator) /* -------------------------------------------------------------------------- */ /* Shutdown gracefully. */ -static int +static void sp_shutdown(int exitval) { cleanvars(); @@ -1293,7 +1293,8 @@ main(int argc, char **argv) sp_shutdown(EXIT_BAD); } - return sp_shutdown(EXIT_NORMAL); + sp_shutdown(EXIT_NORMAL); + return 0; } /* --- if (ft_batchmode) --- */ @@ -1330,5 +1331,6 @@ main(int argc, char **argv) app_rl_readlines(); } - return sp_shutdown(EXIT_NORMAL); + sp_shutdown(EXIT_NORMAL); + return 0; }