From fd05eb8097447db2163a7900a2db30be7aaf9851 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Mon, 6 Mar 2000 18:03:55 +0000 Subject: [PATCH] builtins.c (built_in_class_names, [...]): Constify a char*. * builtins.c (built_in_class_names, built_in_names): Constify a char*. * gmon-sol2.c (monstartup, moncontrol): Cast ptrs to long, not int. (_mcleanup): Ensure value matches format specifier in sprintf. * cpphash.c (special_symbol): Don't needlessly cast away const-ness. * cppinit.c (base_name): Delete unused prototype. * mkdeps.c (deps_init): Make definition K&R safe. * tree.h (built_in_class_names, built_in_names): Constify a char*. f: * ansify.c (die_unless): Don't use ANSI string concatenation. (die): Mark with ATTRIBUTE_NORETURN. From-SVN: r32364 --- gcc/ChangeLog | 19 +++++++++++++++++++ gcc/builtins.c | 4 ++-- gcc/config/sparc/gmon-sol2.c | 8 ++++---- gcc/cpphash.c | 2 +- gcc/cppinit.c | 1 - gcc/f/ChangeLog | 5 +++++ gcc/f/ansify.c | 4 ++-- gcc/mkdeps.c | 2 +- gcc/tree.h | 4 ++-- 9 files changed, 36 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4cffd3b817e..5428664dd00 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,22 @@ +2000-03-06 Kaveh R. Ghazi + + * builtins.c (built_in_class_names, built_in_names): Constify a + char*. + + * gmon-sol2.c (monstartup, moncontrol): Cast ptrs to long, not + int. + (_mcleanup): Ensure value matches format specifier in sprintf. + + * cpphash.c (special_symbol): Don't needlessly cast away + const-ness. + + * cppinit.c (base_name): Delete unused prototype. + + * mkdeps.c (deps_init): Make definition K&R safe. + + * tree.h (built_in_class_names, built_in_names): Constify a + char*. + 2000-03-06 Jakub Jelinek * config/sparc/sparc.c (eligible_for_epilogue_delay): Accept diff --git a/gcc/builtins.c b/gcc/builtins.c index c77d51c496d..a38f3c4b861 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -57,10 +57,10 @@ Boston, MA 02111-1307, USA. */ #endif /* Define the names of the builtin function types and codes. */ -char *built_in_class_names[4] +const char *const built_in_class_names[4] = {"NOT_BUILT_IN", "BUILT_IN_FRONTEND", "BUILT_IN_MD", "BUILT_IN_NORMAL"}; -char *built_in_names[(int) END_BUILTINS] = +const char *const built_in_names[(int) END_BUILTINS] = {"BUILT_IN_ALLOCA", "BUILT_IN_ABS", "BUILT_IN_FABS", "BUILT_IN_LABS", "BUILT_IN_FFS", "BUILT_IN_DIV", "BUILT_IN_LDIV", "BUILT_IN_FFLOOR", "BUILT_IN_FCEIL", "BUILT_IN_FMOD", "BUILT_IN_FREM", "BUILT_IN_MEMCPY", diff --git a/gcc/config/sparc/gmon-sol2.c b/gcc/config/sparc/gmon-sol2.c index 063dcdf94f9..1e5f0da9467 100644 --- a/gcc/config/sparc/gmon-sol2.c +++ b/gcc/config/sparc/gmon-sol2.c @@ -102,10 +102,10 @@ void monstartup(lowpc, highpc) * so the rest of the scaling (here and in gprof) stays in ints. */ lowpc = (char *) - ROUNDDOWN((unsigned)lowpc, HISTFRACTION*sizeof(HISTCOUNTER)); + ROUNDDOWN((unsigned long)lowpc, HISTFRACTION*sizeof(HISTCOUNTER)); s_lowpc = lowpc; highpc = (char *) - ROUNDUP((unsigned)highpc, HISTFRACTION*sizeof(HISTCOUNTER)); + ROUNDUP((unsigned long)highpc, HISTFRACTION*sizeof(HISTCOUNTER)); s_highpc = highpc; s_textsize = highpc - lowpc; monsize = (s_textsize / HISTFRACTION) + sizeof(struct phdr); @@ -195,7 +195,7 @@ _mcleanup() else progname++; - sprintf(buf, "%s/%ld.%s", profdir, getpid(), progname); + sprintf(buf, "%s/%ld.%s", profdir, (long) getpid(), progname); proffile = buf; } else { proffile = "gmon.out"; @@ -412,7 +412,7 @@ static void moncontrol(mode) /* start */ profil((unsigned short *)(sbuf + sizeof(struct phdr)), ssiz - sizeof(struct phdr), - (int)s_lowpc, s_scale); + (long)s_lowpc, s_scale); profiling = 0; } else { /* stop */ diff --git a/gcc/cpphash.c b/gcc/cpphash.c index a85c7c2b0b6..bb772eb72c9 100644 --- a/gcc/cpphash.c +++ b/gcc/cpphash.c @@ -897,7 +897,7 @@ special_symbol (hp, pfile) while (!ip->nominal_fname && ip != CPP_NULL_BUFFER (pfile)) ip = CPP_PREV_BUFFER (ip); if (ip->system_header_p - && !cpp_lookup (pfile, (U_CHAR *) "__STRICT_ANSI__", 15)) + && !cpp_lookup (pfile, (const U_CHAR *) "__STRICT_ANSI__", 15)) CPP_PUTC_Q (pfile, '0'); else #endif diff --git a/gcc/cppinit.c b/gcc/cppinit.c index daac637fe95..4286ecbe315 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -178,7 +178,6 @@ static void initialize_builtins PARAMS ((cpp_reader *)); static void append_include_chain PARAMS ((cpp_reader *, struct cpp_pending *, char *, int, int)); -static char *base_name PARAMS ((const char *)); static void dump_special_to_buffer PARAMS ((cpp_reader *, const char *)); static void initialize_dependency_output PARAMS ((cpp_reader *)); static void initialize_standard_includes PARAMS ((cpp_reader *)); diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 819c601687d..780482abf6e 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 6 13:01:19 2000 Kaveh R. Ghazi + + * ansify.c (die_unless): Don't use ANSI string concatenation. + (die): Mark with ATTRIBUTE_NORETURN. + Wed Mar 1 00:31:44 2000 Martin von Loewis * com.c (current_function_decl): Move to toplev.c. diff --git a/gcc/f/ansify.c b/gcc/f/ansify.c index 6c6d01f911f..d2eea9118e2 100644 --- a/gcc/f/ansify.c +++ b/gcc/f/ansify.c @@ -45,12 +45,12 @@ typedef enum #define die_unless(c) \ do if (!(c)) \ { \ - fprintf (stderr, "%s:%lu: " #c "\n", argv[1], lineno); \ + fprintf (stderr, "%s:%lu: %s\n", argv[1], lineno, #c); \ die (); \ } \ while(0) -static void +static void ATTRIBUTE_NORETURN die (void) { exit (1); diff --git a/gcc/mkdeps.c b/gcc/mkdeps.c index 617a712c3c6..7b0f2716564 100644 --- a/gcc/mkdeps.c +++ b/gcc/mkdeps.c @@ -127,7 +127,7 @@ base_name (fname) /* Public routines. */ struct deps * -deps_init (void) +deps_init () { struct deps *d = (struct deps *) xmalloc (sizeof (struct deps)); diff --git a/gcc/tree.h b/gcc/tree.h index 1a827581c6b..458fd514920 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -78,7 +78,7 @@ enum built_in_class }; /* Names for the above. */ -extern char *built_in_class_names[4]; +extern const char *const built_in_class_names[4]; /* Codes that identify the various built in functions so that expand_call can identify them quickly. */ @@ -155,7 +155,7 @@ enum built_in_function }; /* Names for the above. */ -extern char *built_in_names[(int) END_BUILTINS]; +extern const char *const built_in_names[(int) END_BUILTINS]; /* The definition of tree nodes fills the next several pages. */