diff --git a/ChangeLog b/ChangeLog index 032677d89..4429de605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2010-06-23 Robert Larice + * src/frontend/breakp.c, + * src/frontend/com_let.c, + * src/frontend/com_measure2.c, + * src/frontend/com_sysinfo.c, + * src/frontend/cpitf.c, + * src/frontend/dotcards.c, + * src/frontend/measure.c, + * src/frontend/mw_coms.c, + * src/frontend/mw_coms.h, + * src/frontend/runcoms.c, + * src/frontend/runcoms2.c, + * src/frontend/where.c, + * src/frontend/where.h, + * src/include/cpextern.h, + * src/include/fteext.h : + ansi function definitions and declarations for the com_*() functions. + remove some casts to NULL. + several com_*() functions don't use their argument, add unused attribute later. + 2010-06-22 Holger Vogt * b4soild.c: line 7598 double assignment of Cbg1 removed * configure.in, /visualc/include/config.h: version 21plus diff --git a/src/frontend/breakp.c b/src/frontend/breakp.c index 4dd1e1ee0..a55e4dc67 100644 --- a/src/frontend/breakp.c +++ b/src/frontend/breakp.c @@ -186,7 +186,7 @@ com_step(wordlist *wl) steps = howmanysteps = atoi(wl->wl_word); else steps = howmanysteps = 1; - com_resume((wordlist *) NULL); + com_resume(NULL); return; } diff --git a/src/frontend/com_let.c b/src/frontend/com_let.c index 07dbed67b..aa54a4176 100644 --- a/src/frontend/com_let.c +++ b/src/frontend/com_let.c @@ -29,7 +29,7 @@ com_let(wordlist *wl) fake_wl.wl_next = NULL; if (!wl) { - com_display((wordlist *) NULL); + com_display(NULL); return; } diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c index 91327e7aa..b911bc706 100644 --- a/src/frontend/com_measure2.c +++ b/src/frontend/com_measure2.c @@ -869,7 +869,7 @@ void measure_ERR3( ) { return; } -void com_dotmeasure( ) { +void com_dotmeasure(wordlist *wl) { /* simulation info */ // printf("*%s\n", plot_cur->pl_title); // printf("\t %s, %s\n", plot_cur->pl_name, plot_cur->pl_date); // missing temp diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c index 1c4cf7d13..29d200454 100644 --- a/src/frontend/com_sysinfo.c +++ b/src/frontend/com_sysinfo.c @@ -83,7 +83,7 @@ static void tesFreeSystemInfo(TesSystemInfo *info) { } /* print system info */ -void com_sysinfo() +void com_sysinfo(wordlist *wl) { int errorcode; TesSystemInfo* info; diff --git a/src/frontend/cpitf.c b/src/frontend/cpitf.c index f93309e7c..67d776580 100644 --- a/src/frontend/cpitf.c +++ b/src/frontend/cpitf.c @@ -328,7 +328,7 @@ cp_periodic(void) void cp_doquit(void) { - com_quit((wordlist *) NULL); + com_quit(NULL); return; } diff --git a/src/frontend/dotcards.c b/src/frontend/dotcards.c index 7e3876997..bfacb71b7 100644 --- a/src/frontend/dotcards.c +++ b/src/frontend/dotcards.c @@ -385,7 +385,7 @@ ft_cktcoms(bool terse) static wordlist ww = { "everything", NULL, NULL } ; com_rusage(&ww); } else if ((!ft_noacctprint) && (!ft_acctprint)) - com_rusage((wordlist *) NULL); + com_rusage(NULL); /* absolutely no accounting if noacct is given */ putc('\n', cp_out); diff --git a/src/frontend/measure.c b/src/frontend/measure.c index 749f8a153..34a2d9f90 100644 --- a/src/frontend/measure.c +++ b/src/frontend/measure.c @@ -50,7 +50,7 @@ com_meas(wordlist *wl) { struct dvec *d; if (!wl) { - com_display((wordlist *) NULL); + com_display(NULL); return; } wl_count = wl; diff --git a/src/frontend/mw_coms.c b/src/frontend/mw_coms.c index 35ed35841..eb94025ab 100644 --- a/src/frontend/mw_coms.c +++ b/src/frontend/mw_coms.c @@ -17,7 +17,7 @@ /* Clears ckt and removes current circ. form database */ void -com_removecirc() +com_removecirc(wordlist *wl) { struct variable *v, *next; struct circ *ct; diff --git a/src/frontend/mw_coms.h b/src/frontend/mw_coms.h index 64e667fde..8fb1ebd87 100644 --- a/src/frontend/mw_coms.h +++ b/src/frontend/mw_coms.h @@ -6,7 +6,7 @@ #ifndef MW_COMS_H_INCLUDED #define MW_COMS_H_INCLUDED -void com_removecirc(void); +void com_removecirc(wordlist *wl); #endif diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c index 85fbdfd24..914fdfd6d 100644 --- a/src/frontend/runcoms.c +++ b/src/frontend/runcoms.c @@ -226,7 +226,7 @@ dosim( ft_setflag = TRUE; /* don't allow abort upon interrupt during run */ ft_intrpt = FALSE; fprintf(cp_err, "Warning: resuming run in progress.\n"); - com_resume((wordlist *) NULL); + com_resume(NULL); ft_setflag = FALSE; /* Now allow aborts again */ return 0; } diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c index a9fdfe3f4..b04aef929 100644 --- a/src/frontend/runcoms2.c +++ b/src/frontend/runcoms2.c @@ -63,7 +63,7 @@ com_resume(wordlist *wl) if (ft_curckt->ci_inprogress == FALSE) { fprintf(cp_err, "Note: run starting\n"); - com_run((wordlist *) NULL); + com_run(NULL); return; } ft_curckt->ci_inprogress = TRUE; diff --git a/src/frontend/where.c b/src/frontend/where.c index b0300baa8..c3379ddd1 100644 --- a/src/frontend/where.c +++ b/src/frontend/where.c @@ -14,7 +14,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #include "where.h" void -com_where(void) +com_where(wordlist *wl) { char *msg; diff --git a/src/frontend/where.h b/src/frontend/where.h index b26a52e37..1ef9025d4 100644 --- a/src/frontend/where.h +++ b/src/frontend/where.h @@ -6,7 +6,7 @@ #ifndef WHERE_H_INCLUDED #define WHERE_H_INCLUDED -void com_where(void); +void com_where(wordlist *wl); #endif diff --git a/src/include/cpextern.h b/src/include/cpextern.h index a47a1b551..4c00031f9 100644 --- a/src/include/cpextern.h +++ b/src/include/cpextern.h @@ -57,12 +57,12 @@ extern bool cp_debug; extern char cp_amp; extern char cp_gt; extern char cp_lt; -extern void com_chdir(); -extern void com_echo(); -extern void com_strcmp(); -extern void com_rehash(); -extern void com_shell(); -extern void cp_ioreset(); +extern void com_chdir(wordlist *wl); +extern void com_echo(wordlist *wl); +extern void com_strcmp(wordlist *wl); +extern void com_rehash(wordlist *wl); +extern void com_shell(wordlist *wl); +extern void cp_ioreset(void); extern wordlist *cp_redirect(); extern wordlist *cp_parse(); @@ -103,7 +103,7 @@ extern char cp_bang; extern char cp_hat; extern int cp_maxhistlength; extern struct histent *cp_lastone; -extern void com_history(); +extern void com_history(wordlist *wl); extern void cp_addhistent(); void cp_hprint(int eventhi, int eventlo, bool rev); extern wordlist *cp_histsubst(); diff --git a/src/include/fteext.h b/src/include/fteext.h index 32bf524f1..96348abe4 100644 --- a/src/include/fteext.h +++ b/src/include/fteext.h @@ -33,9 +33,9 @@ extern void outmenuprompt(); /* aspice.c */ -extern void com_aspice(); -extern void com_jobs(); -extern void com_rspice(); +extern void com_aspice(wordlist *wl); +extern void com_jobs(wordlist *wl); +extern void com_rspice(wordlist *wl); extern void ft_checkkids(); /* binary.c */ @@ -46,14 +46,14 @@ extern struct plot *braw_read(); /* breakpoint.c */ extern bool ft_bpcheck(); -extern void com_delete(); -extern void com_iplot(); -extern void com_save(); -extern void com_save2(wordlist *, char *); -extern void com_step(); -extern void com_stop(); -extern void com_sttus(); -extern void com_trce(); +extern void com_delete(wordlist *wl); +extern void com_iplot(wordlist *wl); +extern void com_save(wordlist *wl); +extern void com_save2(wordlist *wl, char *name); +extern void com_step(wordlist *wl); +extern void com_stop(wordlist *wl); +extern void com_sttus(wordlist *wl); +extern void com_trce(wordlist *wl); extern void ft_trquery(); extern void dbfree( ); @@ -143,39 +143,39 @@ extern struct comm *cp_coms; /* compose.c */ -extern void com_compose(); +extern void com_compose(wordlist *wl); /* cpinterface.c symbols declared in CPextern.h */ /* debugcoms.c */ -extern void com_dump(); -extern void com_state(); +extern void com_dump(wordlist *wl); +extern void com_state(wordlist *wl); /* define.c */ extern struct pnode *ft_substdef(); -extern void com_define(); -extern void com_undefine(); +extern void com_define(wordlist *wl); +extern void com_undefine(wordlist *wl); extern void ft_pnode(); /* device.c */ -extern void com_show(); -extern void com_showmod(); -extern void com_alter(); -extern void com_altermod(); +extern void com_show(wordlist *wl); +extern void com_showmod(wordlist *wl); +extern void com_alter(wordlist *wl); +extern void com_altermod(wordlist *wl); /* diff.c */ -extern void com_diff(); +extern void com_diff(wordlist *wl); /* doplot.c */ -extern void com_asciiplot(); -extern void com_hardcopy(); -extern void com_plot(); -extern void com_xgraph(); +extern void com_asciiplot(wordlist *wl); +extern void com_hardcopy(wordlist *wl); +extern void com_plot(wordlist *wl); +extern void com_xgraph(wordlist *wl); /* dotcards.c */ @@ -226,13 +226,13 @@ extern struct dvec *op_uminus(); extern struct dvec *op_range(); /* spec.c */ -extern void com_spec(); +extern void com_spec(wordlist *wl); /* com_fft.c */ extern void com_fft(wordlist*); /* com_sysinfo.c */ -extern void com_sysinfo(); +extern void com_sysinfo(wordlist *wl); /* ginterface.c @@ -284,9 +284,9 @@ extern void gr_fixgrid(); /* inp.c */ -extern void com_edit(); -extern void com_listing(); -extern void com_source(); +extern void com_edit(wordlist *wl); +extern void com_listing(wordlist *wl); +extern void com_source(wordlist *wl); void inp_dodeck(struct line *deck, char *tt, wordlist *end, bool reuse, struct line *options, char *filename); extern void inp_source(); @@ -301,7 +301,7 @@ extern FILE *inp_pathopen(); void inp_nutsource(FILE *fp, bool comfile, char *filename); void nutinp_dodeck(struct line *deck, char *tt, wordlist *end, bool reuse, struct line *options, char *filename); -extern void nutcom_source(); +extern void nutcom_source(wordlist *wl); /* interpolate.c */ @@ -309,7 +309,7 @@ extern bool ft_interpolate(); extern bool ft_polyfit(); extern double ft_peval(); extern void ft_polyderiv( ); -extern void com_linearize(); +extern void com_linearize(wordlist *wl); /* mfbinterface.c */ @@ -326,17 +326,17 @@ extern void mi_update(); /* misccoms.c */ -extern void com_bug(); -extern void com_ahelp(); -extern void com_ghelp(); -extern void com_help(); -extern void com_quit(); -extern void com_version(); +extern void com_bug(wordlist *wl); +extern void com_ahelp(wordlist *wl); +extern void com_ghelp(wordlist *wl); +extern void com_help(wordlist *wl); +extern void com_quit(wordlist *wl); +extern void com_version(wordlist *wl); extern int hcomp(); -extern void com_where(); +extern void com_where(wordlist *wl); /* mw_coms.c */ -extern void com_removecirc(); +extern void com_removecirc(wordlist *wl); /* numparse.c */ @@ -390,17 +390,17 @@ extern void pi_update(); /* postcoms.c */ -extern void com_cross(); -extern void com_display(); -extern void com_let(); -extern void com_unlet(); -extern void com_load(); -extern void com_print(); -extern void com_write(); -extern void com_destroy(); -extern void com_splot(); -extern void com_setscale(); -extern void com_transpose(); +extern void com_cross(wordlist *wl); +extern void com_display(wordlist *wl); +extern void com_let(wordlist *wl); +extern void com_unlet(wordlist *wl); +extern void com_load(wordlist *wl); +extern void com_print(wordlist *wl); +extern void com_write(wordlist *wl); +extern void com_destroy(wordlist *wl); +extern void com_splot(wordlist *wl); +extern void com_setscale(wordlist *wl); +extern void com_transpose(wordlist *wl); /* rawfile.c */ extern int raw_prec; @@ -414,25 +414,25 @@ extern void com_meas(wordlist *wl); /* resource.c */ -extern void com_rusage(); +extern void com_rusage(wordlist *wl); extern void ft_ckspace(); extern void init_rlimits(); /* runcoms.c */ -extern void com_ac(); -extern void com_dc(); -extern void com_op(); -extern void com_pz(); -extern void com_sens(); -extern void com_rset(); -extern void com_resume(); -extern void com_run(); -extern void com_tran(); -extern void com_tf(); -extern void com_scirc(); -extern void com_disto(); -extern void com_noise(); +extern void com_ac(wordlist *wl); +extern void com_dc(wordlist *wl); +extern void com_op(wordlist *wl); +extern void com_pz(wordlist *wl); +extern void com_sens(wordlist *wl); +extern void com_rset(wordlist *wl); +extern void com_resume(wordlist *wl); +extern void com_run(wordlist *wl); +extern void com_tran(wordlist *wl); +extern void com_tf(wordlist *wl); +extern void com_scirc(wordlist *wl); +extern void com_disto(wordlist *wl); +extern void com_noise(wordlist *wl); extern int ft_dorun(); extern bool ft_getOutReq(FILE **, struct plot **, bool *, char *, char *); @@ -518,7 +518,7 @@ extern bool ft_intrpt; extern bool ft_setflag; /* newcoms.c */ -extern void com_reshape(); +extern void com_reshape(wordlist *wl); /* dimens.c */ extern void dimstring();