From b0791fa925202359a56169bf0e28d89cd49f1c33 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Mon, 29 Nov 1999 02:50:04 +0000 Subject: com.c (ffecom_file_, [...]): Constify a char*. * com.c (ffecom_file_, ffecom_file, file_buf, ffecom_open_include_): Constify a char*. (ffecom_possible_partial_overlap_): Mark parameter `expr2' with ATTRIBUTE_UNUSED. (ffecom_init_0): Use a fully prototyped cast in call to bsearch. (lang_print_error_function): ANSI-fy. * com.h (ffecom_file): Constify a char*. * fini.c (main): Call return, not exit. * g77spec.c (lang_specific_driver): Use non-const *in_argv in assignment. * intrin.c (ffeintrin_cmp_name_): Don't needlessly cast away const-ness. From-SVN: r30693 --- gcc/f/ChangeLog | 19 +++++++++++++++++++ gcc/f/com.c | 21 ++++++++++----------- gcc/f/com.h | 2 +- gcc/f/fini.c | 14 +++++++------- gcc/f/g77spec.c | 2 +- gcc/f/intrin.c | 6 +++--- 6 files changed, 41 insertions(+), 23 deletions(-) (limited to 'gcc') diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index ca606fa..99d597a 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,22 @@ +Sun Nov 28 21:39:05 1999 Kaveh R. Ghazi + + * com.c (ffecom_file_, ffecom_file, file_buf, + ffecom_open_include_): Constify a char*. + (ffecom_possible_partial_overlap_): Mark parameter `expr2' with + ATTRIBUTE_UNUSED. + (ffecom_init_0): Use a fully prototyped cast in call to bsearch. + (lang_print_error_function): ANSI-fy. + + * com.h (ffecom_file): Constify a char*. + + * fini.c (main): Call return, not exit. + + * g77spec.c (lang_specific_driver): Use non-const *in_argv in + assignment. + + * intrin.c (ffeintrin_cmp_name_): Don't needlessly cast away + const-ness. + Sun Nov 28 21:15:29 1999 Kaveh R. Ghazi * com.c (ffecom_get_invented_identifier): Rewrite to take an ellipses. diff --git a/gcc/f/com.c b/gcc/f/com.c index 23c4a9b..92e0285 100644 --- a/gcc/f/com.c +++ b/gcc/f/com.c @@ -484,7 +484,7 @@ static tree start_decl (tree decl, bool is_top_level); static void start_function (tree name, tree type, int nested, int public); #endif /* FFECOM_targetCURRENT == FFECOM_targetGCC */ #if FFECOM_GCC_INCLUDE -static void ffecom_file_ (char *name); +static void ffecom_file_ (const char *name); static void ffecom_initialize_char_syntax_ (void); static void ffecom_close_include_ (FILE *f); static int ffecom_decode_include_option_ (char *spec); @@ -1566,7 +1566,7 @@ ffecom_widest_expr_type_ (ffebld list) aliasing of arguments, it isn't a concern. */ static bool -ffecom_possible_partial_overlap_ (ffebld expr1, ffebld expr2) +ffecom_possible_partial_overlap_ (ffebld expr1, ffebld expr2 ATTRIBUTE_UNUSED) { ffesymbol sym; ffestorag st; @@ -11581,7 +11581,7 @@ ffecom_init_0 () double fl; name = bsearch ("foo", &names[0], ARRAY_SIZE (names), sizeof (names[0]), - (int (*)()) strcmp); + (int (*)(const void *, const void *)) strcmp); if (name != (char *) &names[2]) { assert ("bsearch doesn't work, #define FFEPROJ_BSEARCH 0 in proj.h" @@ -12461,7 +12461,7 @@ ffecom_modify (tree newtype, tree lhs, /* Register source file name. */ void -ffecom_file (char *name) +ffecom_file (const char *name) { #if FFECOM_GCC_INCLUDE ffecom_file_ (name); @@ -14304,9 +14304,8 @@ lang_printable_name (tree decl, int v) an error. */ #if BUILT_FOR_270 -void -lang_print_error_function (file) - const char *file; +static void +lang_print_error_function (const char *file) { static ffeglobal last_g = NULL; static ffesymbol last_s = NULL; @@ -15816,9 +15815,9 @@ static struct file_name_list *last_include = NULL; /* Last in chain */ and for expanding macro arguments. */ #define INPUT_STACK_MAX 400 static struct file_buf { - char *fname; + const char *fname; /* Filename specified with #line command. */ - char *nominal_fname; + const char *nominal_fname; /* Record where in the search path this file was found. For #include_next. */ struct file_name_list *dir; @@ -16160,7 +16159,7 @@ read_name_map (dirname) } static void -ffecom_file_ (char *name) +ffecom_file_ (const char *name) { FILE_BUF *fp; @@ -16273,7 +16272,7 @@ ffecom_open_include_ (char *name, ffewhereLine l, ffewhereColumn c) { int n; char *ep; - char *nam; + const char *nam; if ((nam = fp->nominal_fname) != NULL) { diff --git a/gcc/f/com.h b/gcc/f/com.h index b0f1119..aa26893 100644 --- a/gcc/f/com.h +++ b/gcc/f/com.h @@ -319,7 +319,7 @@ tree ffecom_make_tempvar (const char *commentary, tree type, ffetargetCharacterSize size, int elements); tree ffecom_modify (tree newtype, tree lhs, tree rhs); #endif /* FFECOM_targetCURRENT == FFECOM_targetGCC */ -void ffecom_file (char *name); +void ffecom_file (const char *name); void ffecom_notify_init_storage (ffestorag st); void ffecom_notify_init_symbol (ffesymbol s); void ffecom_notify_primary_entry (ffesymbol fn); diff --git a/gcc/f/fini.c b/gcc/f/fini.c index d09161f..e5eb539 100644 --- a/gcc/f/fini.c +++ b/gcc/f/fini.c @@ -267,7 +267,7 @@ main (int argc, char **argv) if (argc != 4) { fprintf (stderr, "Command form: fini input output-code output-include\n"); - exit (1); + return (1); } input_name = argv[1]; @@ -278,21 +278,21 @@ main (int argc, char **argv) if (in == NULL) { fprintf (stderr, "Cannot open \"%s\"\n", input_name); - exit (1); + return (1); } out = fopen (output_name, "w"); if (out == NULL) { fclose (in); fprintf (stderr, "Cannot open \"%s\"\n", output_name); - exit (1); + return (1); } incl = fopen (include_name, "w"); if (incl == NULL) { fclose (in); fprintf (stderr, "Cannot open \"%s\"\n", include_name); - exit (1); + return (1); } /* Get past the initial block-style comment (man, this parsing code is just @@ -316,7 +316,7 @@ main (int argc, char **argv) else { assert ("EOF too soon!" == NULL); - exit (1); + return (1); } } @@ -441,7 +441,7 @@ main (int argc, char **argv) #endif if (do_exit) - exit (1); + return (1); /* First output the #include file. */ @@ -624,7 +624,7 @@ typedef enum %s_ %s;\n\ fclose (incl); if (in != stdin) fclose (in); - exit (0); + return (0); } void diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c index b0c750f..505bc12 100644 --- a/gcc/f/g77spec.c +++ b/gcc/f/g77spec.c @@ -304,7 +304,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) fprintf (stderr, "\n"); #endif - real_g77_newargv = argv; + real_g77_newargv = *in_argv; g77_xargc = argc; g77_xargv = argv; diff --git a/gcc/f/intrin.c b/gcc/f/intrin.c index d59458c..fa31621 100644 --- a/gcc/f/intrin.c +++ b/gcc/f/intrin.c @@ -1165,9 +1165,9 @@ ffeintrin_check_any_ (ffebld arglist) static int ffeintrin_cmp_name_ (const void *name, const void *intrinsic) { - const char *uc = ((struct _ffeintrin_name_ *) intrinsic)->name_uc; - const char *lc = ((struct _ffeintrin_name_ *) intrinsic)->name_lc; - const char *ic = ((struct _ffeintrin_name_ *) intrinsic)->name_ic; + const char *uc = ((const struct _ffeintrin_name_ *) intrinsic)->name_uc; + const char *lc = ((const struct _ffeintrin_name_ *) intrinsic)->name_lc; + const char *ic = ((const struct _ffeintrin_name_ *) intrinsic)->name_ic; return ffesrc_strcmp_2c (ffe_case_intrin (), name, uc, lc, ic); } -- cgit v1.1