From 0d654894471865cddbd6c2b94939566b6f3a147a Mon Sep 17 00:00:00 2001 From: ghazi Date: Tue, 30 Mar 1999 09:23:52 +0000 Subject: [PATCH] Warning fixes: * sta.c (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): Const-ify a char*. * sta.h (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): Likewise. * stb.c (ffestb_local_u_): Likewise. (ffestb_do, ffestb_dowhile, ffestb_else, ffestb_elsexyz, ffestb_else3_, ffestb_endxyz, ffestb_goto, ffestb_let, ffestb_type, ffestb_type1_, ffestb_varlist, ffestb_R423B, ffestb_R522, ffestb_R528, ffestb_R542, ffestb_R834, ffestb_R835, ffestb_R838, ffestb_R841, ffestb_R1102, ffestb_blockdata, ffestb_R1212, ffestb_R1228, ffestb_V009, ffestb_module, ffestb_R809, ffestb_R810, ffestb_R10014_, ffestb_R10015_, ffestb_R10018_, ffestb_R1107, ffestb_R1202, ffestb_R12026_, ffestb_S3P4, ffestb_V012, ffestb_V014, ffestb_V025, ffestb_V0255_, ffestb_V020, ffestb_dimlist, ffestb_dummy, ffestb_R524, ffestb_R547, ffestb_decl_chartype, ffestb_decl_dbltype, ffestb_decl_gentype, ffestb_decl_recursive, ffestb_decl_entsp_2_, ffestb_decl_func_, ffestb_V003, ffestb_V016, ffestb_V027, ffestb_decl_R539): Likewise. * stb.h (_ffestb_args_): Likewise. * stc.c (ffestc_subr_binsrch_, ffestc_subr_is_present_, ffestc_subr_speccmp_, ffestc_R904, ffestc_R907): Likewise. * std.c (ffestd_R1001dump_1005_1_, ffestd_R1001dump_1005_2_, ffestd_R1001dump_1005_3_, ffestd_R1001dump_1005_4_, ffestd_R1001dump_1005_5_, ffestd_R1001dump_1010_1_, ffestd_R1001dump_1010_2_, ffestd_R1001dump_1010_3_, ffestd_R1001dump_1010_4_, ffestd_R1001dump_1010_5_): Likewise. * ste.c (ffeste_begin_iterdo_, ffeste_subr_file_): Likewise. * sts.c (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. * sts.h (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. * stt.c (ffestt_exprlist_drive, ffestt_implist_drive, ffestt_tokenlist_drive): Add prototype arguments. * stt.h (ffestt_exprlist_drive, ffestt_implist_drive, ffestt_tokenlist_drive): Likewise. * stu.c (ffestu_dummies_transition_): Likewise. (ffestu_sym_end_transition): Const-ify a char*. * stw.c (ffestw_display_state, ffestw_new, ffestw_pop): Add prototype arguments. * stw.h (ffestw_display_state, ffestw_new, ffestw_pop): Likewise. * version.c (ffe_version_string): Const-ify a char*. * version.h (ffe_version_string): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26064 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/f/ChangeLog | 61 +++++++++++++++++++++++++++++++ gcc/f/sta.c | 6 ++-- gcc/f/sta.h | 6 ++-- gcc/f/stb.c | 110 ++++++++++++++++++++++++++++---------------------------- gcc/f/stb.h | 14 ++++---- gcc/f/stc.c | 44 +++++++++++------------ gcc/f/std.c | 40 ++++++++++----------- gcc/f/ste.c | 8 ++--- gcc/f/sts.c | 12 +++---- gcc/f/sts.h | 14 ++++---- gcc/f/stt.c | 6 ++-- gcc/f/stt.h | 6 ++-- gcc/f/stu.c | 6 ++-- gcc/f/stw.c | 6 ++-- gcc/f/stw.h | 6 ++-- gcc/f/version.c | 2 +- gcc/f/version.h | 2 +- 17 files changed, 205 insertions(+), 144 deletions(-) diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 6b3f09fb96a..45394a32e9b 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,64 @@ +Tue Mar 30 12:04:11 1999 Kaveh R. Ghazi + + * sta.c (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): + Const-ify a char*. + + * sta.h (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): + Likewise. + + * stb.c (ffestb_local_u_): Likewise. + (ffestb_do, ffestb_dowhile, ffestb_else, ffestb_elsexyz, + ffestb_else3_, ffestb_endxyz, ffestb_goto, ffestb_let, + ffestb_type, ffestb_type1_, ffestb_varlist, ffestb_R423B, + ffestb_R522, ffestb_R528, ffestb_R542, ffestb_R834, ffestb_R835, + ffestb_R838, ffestb_R841, ffestb_R1102, ffestb_blockdata, + ffestb_R1212, ffestb_R1228, ffestb_V009, ffestb_module, + ffestb_R809, ffestb_R810, ffestb_R10014_, ffestb_R10015_, + ffestb_R10018_, ffestb_R1107, ffestb_R1202, ffestb_R12026_, + ffestb_S3P4, ffestb_V012, ffestb_V014, ffestb_V025, ffestb_V0255_, + ffestb_V020, ffestb_dimlist, ffestb_dummy, ffestb_R524, + ffestb_R547, ffestb_decl_chartype, ffestb_decl_dbltype, + ffestb_decl_gentype, ffestb_decl_recursive, ffestb_decl_entsp_2_, + ffestb_decl_func_, ffestb_V003, ffestb_V016, ffestb_V027, + ffestb_decl_R539): Likewise. + + * stb.h (_ffestb_args_): Likewise. + + * stc.c (ffestc_subr_binsrch_, ffestc_subr_is_present_, + ffestc_subr_speccmp_, ffestc_R904, ffestc_R907): Likewise. + + * std.c (ffestd_R1001dump_1005_1_, ffestd_R1001dump_1005_2_, + ffestd_R1001dump_1005_3_, ffestd_R1001dump_1005_4_, + ffestd_R1001dump_1005_5_, ffestd_R1001dump_1010_1_, + ffestd_R1001dump_1010_2_, ffestd_R1001dump_1010_3_, + ffestd_R1001dump_1010_4_, ffestd_R1001dump_1010_5_): Likewise. + + * ste.c (ffeste_begin_iterdo_, ffeste_subr_file_): Likewise. + + * sts.c (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, + ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. + + * sts.h (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, + ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. + + * stt.c (ffestt_exprlist_drive, ffestt_implist_drive, + ffestt_tokenlist_drive): Add prototype arguments. + + * stt.h (ffestt_exprlist_drive, ffestt_implist_drive, + ffestt_tokenlist_drive): Likewise. + + * stu.c (ffestu_dummies_transition_): Likewise. + (ffestu_sym_end_transition): Const-ify a char*. + + * stw.c (ffestw_display_state, ffestw_new, ffestw_pop): Add + prototype arguments. + + * stw.h (ffestw_display_state, ffestw_new, ffestw_pop): Likewise. + + * version.c (ffe_version_string): Const-ify a char*. + + * version.h (ffe_version_string): Likewise. + Sat Mar 27 13:00:43 1999 Kaveh R. Ghazi * bad.c (_ffebad_message_, ffebad_string_, ffebad_message_, diff --git a/gcc/f/sta.c b/gcc/f/sta.c index dd825b5388d..52cb37b2aae 100644 --- a/gcc/f/sta.c +++ b/gcc/f/sta.c @@ -1701,7 +1701,7 @@ ffesta_ffebad_1p (ffebad errnum, ffelexToken names_token, ffeTokenLength index, } void -ffesta_ffebad_1sp (ffebad errnum, char *s, ffelexToken names_token, +ffesta_ffebad_1sp (ffebad errnum, const char *s, ffelexToken names_token, ffeTokenLength index, ffelexToken next_token) { ffewhereLine line; @@ -1735,7 +1735,7 @@ ffesta_ffebad_1sp (ffebad errnum, char *s, ffelexToken names_token, } void -ffesta_ffebad_1st (ffebad errnum, char *s, ffelexToken t) +ffesta_ffebad_1st (ffebad errnum, const char *s, ffelexToken t) { if (ffesta_ffebad_start (errnum)) { @@ -1764,7 +1764,7 @@ ffesta_ffebad_1t (ffebad errnum, ffelexToken t) } void -ffesta_ffebad_2st (ffebad errnum, char *s, ffelexToken t1, ffelexToken t2) +ffesta_ffebad_2st (ffebad errnum, const char *s, ffelexToken t1, ffelexToken t2) { if (ffesta_ffebad_start (errnum)) { diff --git a/gcc/f/sta.h b/gcc/f/sta.h index 87e2d9708c2..64e16079815 100644 --- a/gcc/f/sta.h +++ b/gcc/f/sta.h @@ -90,11 +90,11 @@ ffesymbol ffesta_sym_end_transition (ffesymbol s); ffesymbol ffesta_sym_exec_transition (ffesymbol s); void ffesta_ffebad_1p (ffebad msg, ffelexToken names_token, ffeTokenLength index, ffelexToken next_token); -void ffesta_ffebad_1sp (ffebad msg, char *s, ffelexToken names_token, +void ffesta_ffebad_1sp (ffebad msg, const char *s, ffelexToken names_token, ffeTokenLength index, ffelexToken next_token); -void ffesta_ffebad_1st (ffebad msg, char *s, ffelexToken t); +void ffesta_ffebad_1st (ffebad msg, const char *s, ffelexToken t); void ffesta_ffebad_1t (ffebad msg, ffelexToken t); -void ffesta_ffebad_2st (ffebad msg, char *s, ffelexToken t1, ffelexToken t2); +void ffesta_ffebad_2st (ffebad msg, const char *s, ffelexToken t1, ffelexToken t2); void ffesta_ffebad_2t (ffebad msg, ffelexToken t1, ffelexToken t2); ffelexHandler ffesta_zero (ffelexToken t); ffelexHandler ffesta_two (ffelexToken first, ffelexToken second); diff --git a/gcc/f/stb.c b/gcc/f/stb.c index 7046f74072c..59655e2cac7 100644 --- a/gcc/f/stb.c +++ b/gcc/f/stb.c @@ -404,7 +404,7 @@ union ffestb_local_u_ dimlist; struct { - char *badname; + const char *badname; ffestrFirst first_kw; bool is_subr; } @@ -421,7 +421,7 @@ union ffestb_local_u_ ffesttTokenList toklist;/* For ambiguity resolution. */ ffesttImpList imps; /* List of IMPLICIT letters. */ ffelexHandler imp_handler; /* Call if paren list wasn't letters. */ - char *badname; + const char *badname; ffestrOther kw; /* INTENT(IN/OUT/INOUT). */ ffestpType type; bool parameter; /* If PARAMETER attribute seen (governs =expr @@ -1859,7 +1859,7 @@ ffelexHandler ffestb_do (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexHandler next; ffelexToken nt; ffestrSecond kw; @@ -2033,7 +2033,7 @@ ffelexHandler ffestb_dowhile (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexHandler next; ffelexToken nt; @@ -2507,7 +2507,7 @@ ffelexHandler ffestb_else (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -2600,7 +2600,7 @@ ffelexHandler ffestb_elsexyz (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -2787,7 +2787,7 @@ static ffelexHandler ffestb_else3_ (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelex_set_names (FALSE); @@ -3013,7 +3013,7 @@ ffelexHandler ffestb_endxyz (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -3319,7 +3319,7 @@ ffelexHandler ffestb_goto (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexHandler next; ffelexToken nt; @@ -4152,7 +4152,7 @@ ffestb_let (ffelexToken t) ffelexHandler next; bool vxtparam; /* TRUE if it might really be a VXT PARAMETER stmt. */ - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -4292,7 +4292,7 @@ ffelexHandler ffestb_type (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -4376,7 +4376,7 @@ static ffelexHandler ffestb_type1_ (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelex_set_names (FALSE); @@ -4537,7 +4537,7 @@ ffelexHandler ffestb_varlist (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexToken nt; ffelexHandler next; @@ -5215,7 +5215,7 @@ ffestb_varlist6_ (ffelexToken t) ffelexHandler ffestb_R423B (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -5284,7 +5284,7 @@ ffelexHandler ffestb_R522 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexToken nt; ffelexHandler next; @@ -5528,7 +5528,7 @@ ffestb_R5224_ (ffelexToken t) ffelexHandler ffestb_R528 (ffelexToken t) { - unsigned char *p; + unsigned const char *p; ffeTokenLength i; ffelexToken nt; ffelexHandler next; @@ -6005,7 +6005,7 @@ ffestb_R5373_ (ffelexToken t) ffelexHandler ffestb_R542 (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -6419,7 +6419,7 @@ ffelexHandler ffestb_R834 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -6534,7 +6534,7 @@ ffelexHandler ffestb_R835 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -6648,7 +6648,7 @@ ffestb_R8351_ (ffelexToken t) ffelexHandler ffestb_R838 (ffelexToken t) { - unsigned char *p; + unsigned const char *p; ffeTokenLength i; ffelexHandler next; ffelexToken et; /* First token in target. */ @@ -7073,7 +7073,7 @@ ffestb_R8407_ (ffelexToken t) ffelexHandler ffestb_R841 (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -7141,7 +7141,7 @@ ffelexHandler ffestb_R1102 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -7293,7 +7293,7 @@ ffelexHandler ffestb_blockdata (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -7436,7 +7436,7 @@ ffelexHandler ffestb_R1212 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexHandler next; ffelexToken nt; @@ -7675,7 +7675,7 @@ ffestb_R12271_ (ffelexToken ft, ffebld expr, ffelexToken t) ffelexHandler ffestb_R1228 (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -7744,7 +7744,7 @@ bad_i: /* :::::::::::::::::::: */ ffelexHandler ffestb_V009 (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -8156,7 +8156,7 @@ ffelexHandler ffestb_module (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexToken nt; ffelexToken mt; /* Name in MODULE PROCEDUREname, i.e. includes "PROCEDURE". */ @@ -8429,7 +8429,7 @@ ffelexHandler ffestb_R809 (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -8630,7 +8630,7 @@ ffelexHandler ffestb_R810 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -9185,7 +9185,7 @@ ffestb_R10014_ (ffelexToken t) { ffesttFormatList f; ffeTokenLength i; - char *p; + const char *p; ffestrFormat kw; ffelex_set_expecting_hollerith (0, '\0', @@ -9814,7 +9814,7 @@ ffestb_R10015_ (ffelexToken t) bool split_pea; /* New NAMES requires splitting kP from new edit desc. */ ffestrFormat kw; - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (t)) @@ -10191,7 +10191,7 @@ static ffelexHandler ffestb_R10018_ (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; switch (ffelex_token_type (t)) { @@ -10985,7 +10985,7 @@ ffelexHandler ffestb_R1107 (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -11431,7 +11431,7 @@ ffelexHandler ffestb_R1202 (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -11822,7 +11822,7 @@ ffestb_R12025_ (ffelexToken t) static ffelexHandler ffestb_R12026_ (ffelexToken t) { - char *p; + const char *p; switch (ffelex_token_type (t)) { @@ -11965,7 +11965,7 @@ ffelexHandler ffestb_S3P4 (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexHandler next; ffelexToken nt; ffelexToken ut; @@ -12097,7 +12097,7 @@ ffestb_S3P41_ (ffelexToken ft, ffebld expr, ffelexToken t) ffelexHandler ffestb_V012 (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -12166,7 +12166,7 @@ ffelexHandler ffestb_V014 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexToken nt; ffelexHandler next; @@ -12400,7 +12400,7 @@ ffelexHandler ffestb_V025 (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexToken nt; ffelexHandler next; @@ -12596,7 +12596,7 @@ ffestb_V0254_ (ffelexToken ft, ffebld expr, ffelexToken t) static ffelexHandler ffestb_V0255_ (ffelexToken t) { - char *p; + const char *p; switch (ffelex_token_type (t)) { @@ -17910,7 +17910,7 @@ ffelexHandler ffestb_V020 (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexHandler next; ffestpTypeIx ix; @@ -18846,7 +18846,7 @@ ffelexHandler ffestb_dimlist (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexToken nt; ffelexHandler next; @@ -19400,7 +19400,7 @@ ffelexHandler ffestb_dummy (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; switch (ffelex_token_type (ffesta_tokens[0])) { @@ -19619,7 +19619,7 @@ ffelexHandler ffestb_R524 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexToken nt; ffelexHandler next; @@ -19848,7 +19848,7 @@ ffelexHandler ffestb_R547 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexToken nt; ffelexHandler next; @@ -20486,7 +20486,7 @@ ffelexHandler ffestb_decl_chartype (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffestb_local_.decl.type = FFESTP_typeCHARACTER; ffestb_local_.decl.recursive = NULL; @@ -20673,7 +20673,7 @@ ffelexHandler ffestb_decl_dbltype (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffestb_local_.decl.type = ffestb_args.decl.type; ffestb_local_.decl.recursive = NULL; @@ -20864,7 +20864,7 @@ ffelexHandler ffestb_decl_gentype (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffestb_local_.decl.type = ffestb_args.decl.type; ffestb_local_.decl.recursive = NULL; @@ -21010,7 +21010,7 @@ ffelexHandler ffestb_decl_recursive (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexToken nt; ffelexToken ot; ffelexHandler next; @@ -22668,7 +22668,7 @@ ffestb_decl_entsp_2_ (ffelexToken t) { ffelexToken nt; bool asterisk_ok; - unsigned char *p; + unsigned const char *p; ffeTokenLength i; switch (ffelex_token_type (t)) @@ -23095,7 +23095,7 @@ ffestb_decl_entsp_8_ (ffelexToken t) static ffelexHandler ffestb_decl_func_ (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; ffelex_set_names (FALSE); @@ -23573,7 +23573,7 @@ ffelexHandler ffestb_V003 (ffelexToken t) { ffeTokenLength i; - char *p; + const char *p; ffelexToken nt; ffelexHandler next; @@ -23889,7 +23889,7 @@ bad: /* :::::::::::::::::::: */ ffelexHandler ffestb_V016 (ffelexToken t) { - char *p; + const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -24157,7 +24157,7 @@ ffestb_V0166_ (ffelexToken t) ffelexHandler ffestb_V027 (ffelexToken t) { - unsigned char *p; + unsigned const char *p; ffeTokenLength i; switch (ffelex_token_type (ffesta_tokens[0])) @@ -24337,7 +24337,7 @@ ffelexHandler ffestb_decl_R539 (ffelexToken t) { ffeTokenLength i; - unsigned char *p; + unsigned const char *p; ffelexToken nt; ffestrSecond kw; diff --git a/gcc/f/stb.h b/gcc/f/stb.h index da4123c1fa1..6ee761d588c 100644 --- a/gcc/f/stb.h +++ b/gcc/f/stb.h @@ -50,7 +50,7 @@ struct _ffestb_args_ { struct { - char *badname; + const char *badname; ffeTokenLength len; /* Length of "ENTRY/FUNCTION/SUBROUTINE". */ bool is_subr; /* TRUE if SUBROUTINE or if ENTRY within SUBROUTINE. */ @@ -58,7 +58,7 @@ struct _ffestb_args_ dummy; struct { - char *badname; + const char *badname; ffeTokenLength len; /* Length of "BACKSPACE/ENDFILE/REWIND/UNLOCK". */ } @@ -82,7 +82,7 @@ struct _ffestb_args_ #if FFESTR_F90 struct { - char *badname; + const char *badname; ffeTokenLength len; /* Length of "ALLOCATE/DEALLOCATE". */ ffeexprContext ctx; /* Either ALLOCATE or DEALLOCATE. */ } @@ -90,7 +90,7 @@ struct _ffestb_args_ #endif struct { - char *badname; + const char *badname; ffeTokenLength len; /* Length of "EXTERNAL/INTENT/INTRINSIC/OPTIONAL/PUBLIC/ PRIVATE". */ @@ -99,7 +99,7 @@ struct _ffestb_args_ #if FFESTR_VXT struct { - char *badname; + const char *badname; ffeTokenLength len; /* Length of "ENCODE/DECODE". */ } vxtcode; @@ -107,14 +107,14 @@ struct _ffestb_args_ #if FFESTR_F90 struct { - char *badname; + const char *badname; ffeTokenLength len; /* Length of "ALLOCATABLE/POINTER/TARGET". */ } dimlist; #endif struct { - char *badname; + const char *badname; ffeTokenLength len; /* Length of "DIMENSION/VIRTUAL". */ } R524; diff --git a/gcc/f/stc.c b/gcc/f/stc.c index 83c2ad6a208..1a74301e33c 100644 --- a/gcc/f/stc.c +++ b/gcc/f/stc.c @@ -339,14 +339,14 @@ static void ffestc_shriek_where_ (bool ok); #if FFESTR_F90 static void ffestc_shriek_wherethen_ (bool ok); #endif -static int ffestc_subr_binsrch_ (char **list, int size, ffestpFile *spec, - char *whine); +static int ffestc_subr_binsrch_ (const char **list, int size, ffestpFile *spec, + const char *whine); static ffestvFormat ffestc_subr_format_ (ffestpFile *spec); static bool ffestc_subr_is_branch_ (ffestpFile *spec); static bool ffestc_subr_is_format_ (ffestpFile *spec); -static bool ffestc_subr_is_present_ (char *name, ffestpFile *spec); -static int ffestc_subr_speccmp_ (char *string, ffestpFile *spec, - char **target, int *length); +static bool ffestc_subr_is_present_ (const char *name, ffestpFile *spec); +static int ffestc_subr_speccmp_ (const char *string, ffestpFile *spec, + const char **target, int *length); static ffestvUnit ffestc_subr_unit_ (ffestpFile *spec); static void ffestc_try_shriek_do_ (void); @@ -5044,14 +5044,14 @@ ffestc_shriek_wherethen_ (bool ok) using "etc" as the pick-one-of-these string. */ static int -ffestc_subr_binsrch_ (char **list, int size, ffestpFile *spec, char *whine) +ffestc_subr_binsrch_ (const char **list, int size, ffestpFile *spec, const char *whine) { int lowest_tested; int highest_tested; int halfway; int offset; int c; - char *str; + const char *str; int len; if (size == 0) @@ -5186,7 +5186,7 @@ ffestc_subr_is_format_ (ffestpFile *spec) ffestc_subr_is_present_("SPECIFIER",&specifier); */ static bool -ffestc_subr_is_present_ (char *name, ffestpFile *spec) +ffestc_subr_is_present_ (const char *name, ffestpFile *spec) { if (spec->kw_or_val_present) { @@ -5219,7 +5219,7 @@ ffestc_subr_is_present_ (char *name, ffestpFile *spec) 0 if 2 is returned, the length of the constant string value otherwise. */ static int -ffestc_subr_speccmp_ (char *string, ffestpFile *spec, char **target, +ffestc_subr_speccmp_ (const char *string, ffestpFile *spec, const char **target, int *length) { ffebldConstant c; @@ -10198,7 +10198,7 @@ ffestc_R904 () { int i; int expect_file; - char *status_strs[] + const char *status_strs[] = { "New", @@ -10207,7 +10207,7 @@ ffestc_R904 () "Scratch", "Unknown" }; - char *access_strs[] + const char *access_strs[] = { "Append", @@ -10215,20 +10215,20 @@ ffestc_R904 () "Keyed", "Sequential" }; - char *blank_strs[] + const char *blank_strs[] = { "Null", "Zero" }; - char *carriagecontrol_strs[] + const char *carriagecontrol_strs[] = { "Fortran", "List", "None" }; - char *dispose_strs[] + const char *dispose_strs[] = { "Delete", @@ -10239,41 +10239,41 @@ ffestc_R904 () "Submit", "Submit/Delete" }; - char *form_strs[] + const char *form_strs[] = { "Formatted", "Unformatted" }; - char *organization_strs[] + const char *organization_strs[] = { "Indexed", "Relative", "Sequential" }; - char *position_strs[] + const char *position_strs[] = { "Append", "AsIs", "Rewind" }; - char *action_strs[] + const char *action_strs[] = { "Read", "ReadWrite", "Write" }; - char *delim_strs[] + const char *delim_strs[] = { "Apostrophe", "None", "Quote" }; - char *recordtype_strs[] + const char *recordtype_strs[] = { "Fixed", @@ -10283,7 +10283,7 @@ ffestc_R904 () "Stream_LF", "Variable" }; - char *pad_strs[] + const char *pad_strs[] = { "No", @@ -10453,7 +10453,7 @@ ffestc_R904 () void ffestc_R907 () { - char *status_strs[] + const char *status_strs[] = { "Delete", diff --git a/gcc/f/std.c b/gcc/f/std.c index 26757bc9df1..965c465586f 100644 --- a/gcc/f/std.c +++ b/gcc/f/std.c @@ -526,25 +526,25 @@ static void ffestd_subr_f90_ (void); static void ffestd_subr_labels_ (bool unexpected); static void ffestd_R1001dump_ (ffests s, ffesttFormatList list); static void ffestd_R1001dump_1005_1_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1005_2_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1005_3_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1005_4_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1005_5_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1010_1_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1010_2_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1010_3_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1010_4_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001dump_1010_5_ (ffests s, ffesttFormatList f, - char *string); + const char *string); static void ffestd_R1001error_ (ffesttFormatList f); static void ffestd_R1001rtexpr_ (ffests s, ffesttFormatList f, ffebld expr); @@ -4487,7 +4487,7 @@ ffestd_R1001dump_ (ffests s, ffesttFormatList list) The format is dumped with form [r]X[w]. */ static void -ffestd_R1001dump_1005_1_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1005_1_ (ffests s, ffesttFormatList f, const char *string) { assert (!f->u.R1005.R1007_or_R1008.present); assert (!f->u.R1005.R1009.present); @@ -4519,7 +4519,7 @@ ffestd_R1001dump_1005_1_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form [r]Xw. */ static void -ffestd_R1001dump_1005_2_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1005_2_ (ffests s, ffesttFormatList f, const char *string) { assert (!f->u.R1005.R1007_or_R1008.present); assert (!f->u.R1005.R1009.present); @@ -4549,7 +4549,7 @@ ffestd_R1001dump_1005_2_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form [r]Xw[.m]. */ static void -ffestd_R1001dump_1005_3_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1005_3_ (ffests s, ffesttFormatList f, const char *string) { assert (!f->u.R1005.R1009.present); assert (f->u.R1005.R1006.present); @@ -4588,7 +4588,7 @@ ffestd_R1001dump_1005_3_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form [r]Xw.d. */ static void -ffestd_R1001dump_1005_4_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1005_4_ (ffests s, ffesttFormatList f, const char *string) { assert (!f->u.R1005.R1009.present); assert (f->u.R1005.R1007_or_R1008.present); @@ -4624,7 +4624,7 @@ ffestd_R1001dump_1005_4_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form [r]Xw.d[Ee]. */ static void -ffestd_R1001dump_1005_5_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1005_5_ (ffests s, ffesttFormatList f, const char *string) { assert (f->u.R1005.R1007_or_R1008.present); assert (f->u.R1005.R1006.present); @@ -4668,7 +4668,7 @@ ffestd_R1001dump_1005_5_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form X. */ static void -ffestd_R1001dump_1010_1_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1010_1_ (ffests s, ffesttFormatList f, const char *string) { assert (!f->u.R1010.val.present); @@ -4683,7 +4683,7 @@ ffestd_R1001dump_1010_1_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form [r]X. */ static void -ffestd_R1001dump_1010_2_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1010_2_ (ffests s, ffesttFormatList f, const char *string) { if (f->u.R1010.val.present) { @@ -4704,7 +4704,7 @@ ffestd_R1001dump_1010_2_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form nX. */ static void -ffestd_R1001dump_1010_3_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1010_3_ (ffests s, ffesttFormatList f, const char *string) { assert (f->u.R1010.val.present); @@ -4724,7 +4724,7 @@ ffestd_R1001dump_1010_3_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form kX. Note that k is signed. */ static void -ffestd_R1001dump_1010_4_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1010_4_ (ffests s, ffesttFormatList f, const char *string) { assert (f->u.R1010.val.present); @@ -4744,7 +4744,7 @@ ffestd_R1001dump_1010_4_ (ffests s, ffesttFormatList f, char *string) The format is dumped with form Xn. */ static void -ffestd_R1001dump_1010_5_ (ffests s, ffesttFormatList f, char *string) +ffestd_R1001dump_1010_5_ (ffests s, ffesttFormatList f, const char *string) { assert (f->u.R1010.val.present); diff --git a/gcc/f/ste.c b/gcc/f/ste.c index 113548c127d..d6741399fca 100644 --- a/gcc/f/ste.c +++ b/gcc/f/ste.c @@ -113,7 +113,7 @@ static void ffeste_begin_iterdo_ (ffestw block, tree *tvar, tree *tincr, ffebld start, ffelexToken start_token, ffebld end, ffelexToken end_token, ffebld incr, ffelexToken incr_token, - char *msg); + const char *msg); static void ffeste_end_iterdo_ (tree tvar, tree tincr, tree itersvar); static void ffeste_io_call_ (tree call, bool do_check); static tree ffeste_io_dofio_ (ffebld expr); @@ -141,7 +141,7 @@ static tree ffeste_io_olist_ (bool have_err, ffebld unit_expr, ffestpFile *blank_spec); static void ffeste_subr_beru_ (ffestpBeruStmt *info, ffecomGfrt rt); #elif FFECOM_targetCURRENT == FFECOM_targetFFE -static void ffeste_subr_file_ (char *kw, ffestpFile *spec); +static void ffeste_subr_file_ (const char *kw, ffestpFile *spec); #else #error #endif @@ -302,7 +302,7 @@ ffeste_begin_iterdo_ (ffestw block, tree *xtvar, tree *xtincr, ffebld start, ffelexToken start_token, ffebld end, ffelexToken end_token, ffebld incr, ffelexToken incr_token, - char *msg) + const char *msg) { tree tvar; tree expr; @@ -1942,7 +1942,7 @@ ffeste_io_olist_ (bool have_err, #if FFECOM_targetCURRENT == FFECOM_targetFFE static void -ffeste_subr_file_ (char *kw, ffestpFile *spec) +ffeste_subr_file_ (const char *kw, ffestpFile *spec) { if (!spec->kw_or_val_present) return; diff --git a/gcc/f/sts.c b/gcc/f/sts.c index 6fa239c9a1d..143f55050f1 100644 --- a/gcc/f/sts.c +++ b/gcc/f/sts.c @@ -104,7 +104,7 @@ ffests_new (ffests s, mallocPool pool, ffestsLength size) Like printf, but into a string. */ void -ffests_printf_1D (ffests s, char *ctl, long arg1) +ffests_printf_1D (ffests s, const char *ctl, long arg1) { char quickbuf[40]; char *buff; @@ -133,7 +133,7 @@ ffests_printf_1D (ffests s, char *ctl, long arg1) Like printf, but into a string. */ void -ffests_printf_1U (ffests s, char *ctl, unsigned long arg1) +ffests_printf_1U (ffests s, const char *ctl, unsigned long arg1) { char quickbuf[40]; char *buff; @@ -162,7 +162,7 @@ ffests_printf_1U (ffests s, char *ctl, unsigned long arg1) Like printf, but into a string. */ void -ffests_printf_1s (ffests s, char *ctl, char *arg1) +ffests_printf_1s (ffests s, const char *ctl, const char *arg1) { char quickbuf[40]; char *buff; @@ -190,7 +190,7 @@ ffests_printf_1s (ffests s, char *ctl, char *arg1) Like printf, but into a string. */ void -ffests_printf_2Us (ffests s, char *ctl, unsigned long arg1, char *arg2) +ffests_printf_2Us (ffests s, const char *ctl, unsigned long arg1, const char *arg2) { char quickbuf[60]; char *buff; @@ -228,7 +228,7 @@ ffests_putc (ffests s, char c) ffests_puts(s,"append me"); */ void -ffests_puts (ffests s, char *string) +ffests_puts (ffests s, const char *string) { ffests_puttext (s, string, strlen (string)); } @@ -242,7 +242,7 @@ ffests_puts (ffests s, char *string) and may be 0. */ void -ffests_puttext (ffests s, char *text, ffestsLength length) +ffests_puttext (ffests s, const char *text, ffestsLength length) { ffestsLength newlen; ffestsLength newmax; diff --git a/gcc/f/sts.h b/gcc/f/sts.h index 305f7a0b08b..1432d41fd88 100644 --- a/gcc/f/sts.h +++ b/gcc/f/sts.h @@ -60,14 +60,14 @@ struct _ffests_ void ffests_kill (ffests s); void ffests_new (ffests s, mallocPool pool, ffestsLength size); -void ffests_printf_1D (ffests s, char *ctl, long arg1); -void ffests_printf_1U (ffests s, char *ctl, unsigned long arg1); -void ffests_printf_1s (ffests s, char *ctl, char *arg1); -void ffests_printf_2Us (ffests s, char *ctl, unsigned long arg1, - char *arg2); +void ffests_printf_1D (ffests s, const char *ctl, long arg1); +void ffests_printf_1U (ffests s, const char *ctl, unsigned long arg1); +void ffests_printf_1s (ffests s, const char *ctl, const char *arg1); +void ffests_printf_2Us (ffests s, const char *ctl, unsigned long arg1, + const char *arg2); void ffests_putc (ffests s, char c); -void ffests_puts (ffests s, char *string); -void ffests_puttext (ffests s, char *text, ffestsLength length); +void ffests_puts (ffests s, const char *string); +void ffests_puttext (ffests s, const char *text, ffestsLength length); /* Define macros. */ diff --git a/gcc/f/stt.c b/gcc/f/stt.c index ad773c48bb3..4b008e257ce 100644 --- a/gcc/f/stt.c +++ b/gcc/f/stt.c @@ -598,7 +598,7 @@ ffestt_exprlist_create () at a time. */ void -ffestt_exprlist_drive (ffesttExprList list, void (*fn) ()) +ffestt_exprlist_drive (ffesttExprList list, void (*fn) (ffebld, ffelexToken)) { ffesttExprList next; @@ -837,7 +837,7 @@ ffestt_implist_create () The token pairs in the list are passed to the function one pair at a time. */ void -ffestt_implist_drive (ffesttImpList list, void (*fn) ()) +ffestt_implist_drive (ffesttImpList list, void (*fn) (ffelexToken, ffelexToken)) { ffesttImpList next; @@ -951,7 +951,7 @@ ffestt_tokenlist_create () The tokens in the list are passed to the given function. */ void -ffestt_tokenlist_drive (ffesttTokenList tl, void (*fn) ()) +ffestt_tokenlist_drive (ffesttTokenList tl, void (*fn) (ffelexToken)) { ffesttTokenItem ti; diff --git a/gcc/f/stt.h b/gcc/f/stt.h index d365bf5bd8a..341daa7a41d 100644 --- a/gcc/f/stt.h +++ b/gcc/f/stt.h @@ -181,7 +181,7 @@ void ffestt_dimlist_kill (ffesttDimList list); ffestpDimtype ffestt_dimlist_type (ffesttDimList dims, bool is_ugly_assumed); void ffestt_exprlist_append (ffesttExprList list, ffebld expr, ffelexToken t); ffesttExprList ffestt_exprlist_create (void); -void ffestt_exprlist_drive (ffesttExprList list, void (*fn) ()); +void ffestt_exprlist_drive (ffesttExprList list, void (*fn) (ffebld, ffelexToken)); #if FFECOM_targetCURRENT == FFECOM_targetFFE void ffestt_exprlist_dump (ffesttExprList list); #endif @@ -196,14 +196,14 @@ void ffestt_formatlist_kill (ffesttFormatList list); void ffestt_implist_append (ffesttImpList list, ffelexToken first, ffelexToken last); ffesttImpList ffestt_implist_create (void); -void ffestt_implist_drive (ffesttImpList list, void (*fn) ()); +void ffestt_implist_drive (ffesttImpList list, void (*fn) (ffelexToken, ffelexToken)); #if FFECOM_targetCURRENT == FFECOM_targetFFE void ffestt_implist_dump (ffesttImpList list); #endif void ffestt_implist_kill (ffesttImpList list); void ffestt_tokenlist_append (ffesttTokenList list, ffelexToken t); ffesttTokenList ffestt_tokenlist_create (void); -void ffestt_tokenlist_drive (ffesttTokenList list, void (*fn) ()); +void ffestt_tokenlist_drive (ffesttTokenList list, void (*fn) (ffelexToken)); #if FFECOM_targetCURRENT == FFECOM_targetFFE void ffestt_tokenlist_dump (ffesttTokenList list); #endif diff --git a/gcc/f/stu.c b/gcc/f/stu.c index e201c310166..cc1d95c7681 100644 --- a/gcc/f/stu.c +++ b/gcc/f/stu.c @@ -60,7 +60,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA static void ffestu_list_exec_transition_ (ffebld list); static bool ffestu_symter_end_transition_ (ffebld expr); static bool ffestu_symter_exec_transition_ (ffebld expr); -static bool ffestu_dummies_transition_ (ffesymbol (*symfunc) (), +static bool ffestu_dummies_transition_ (ffesymbol (*symfunc) (ffesymbol), ffebld list); /* Internal macros. */ @@ -122,7 +122,7 @@ ffestu_sym_end_transition (ffesymbol s) ffeinfoBasictype bt; ffeinfoKindtype kt; bool array; - char *name = NULL; + const char *name = NULL; ffestu_dummies_transition_ (ffecom_sym_end_transition, ffesymbol_dummyargs (s)); @@ -1114,7 +1114,7 @@ tail: /* :::::::::::::::::::: */ Make sure we don't get called recursively ourselves! */ static bool -ffestu_dummies_transition_ (ffesymbol (*symfunc) (), ffebld list) +ffestu_dummies_transition_ (ffesymbol (*symfunc) (ffesymbol), ffebld list) { static bool in_progress = FALSE; ffebld item; diff --git a/gcc/f/stw.c b/gcc/f/stw.c index 71218452a0f..058b1eb952a 100644 --- a/gcc/f/stw.c +++ b/gcc/f/stw.c @@ -74,7 +74,7 @@ ffestw ffestw_stack_top_ = NULL; ffestw_display_state(); */ void -ffestw_display_state () +ffestw_display_state (void) { assert (ffestw_stack_top_ != NULL); @@ -320,7 +320,7 @@ ffestw_kill (ffestw b) b = ffestw_new(); */ ffestw -ffestw_new () +ffestw_new (void) { ffestw b; @@ -335,7 +335,7 @@ ffestw_new () ffestw_pop(); */ ffestw -ffestw_pop () +ffestw_pop (void) { ffestw b; ffestw oldb = ffestw_stack_top_; diff --git a/gcc/f/stw.h b/gcc/f/stw.h index 92b5ff9ddb8..7a81d9b28a7 100644 --- a/gcc/f/stw.h +++ b/gcc/f/stw.h @@ -118,11 +118,11 @@ extern ffestw ffestw_stack_top_; /* Declare functions with prototypes. */ -void ffestw_display_state (); +void ffestw_display_state (void); void ffestw_kill (ffestw block); void ffestw_init_0 (void); -ffestw ffestw_new (); -ffestw ffestw_pop (); +ffestw ffestw_new (void); +ffestw ffestw_pop (void); ffestw ffestw_push (ffestw block); ffestw ffestw_update (ffestw block); ffestw ffestw_use (ffestw block); diff --git a/gcc/f/version.c b/gcc/f/version.c index 7b978f4e888..83cb30cbbe5 100644 --- a/gcc/f/version.c +++ b/gcc/f/version.c @@ -1 +1 @@ -char *ffe_version_string = "0.5.24-19990313"; +const char *ffe_version_string = "0.5.24-19990313"; diff --git a/gcc/f/version.h b/gcc/f/version.h index cd578a8b1e3..62f941d25d3 100644 --- a/gcc/f/version.h +++ b/gcc/f/version.h @@ -1,6 +1,6 @@ #ifndef _H_f_version #define _H_f_version -extern char *ffe_version_string; +extern const char *ffe_version_string; #endif -- 2.11.0