From 47cefa470e760e09054d1a0ba74743391f6d4149 Mon Sep 17 00:00:00 2001 From: ghazi Date: Tue, 7 Sep 1999 15:41:26 +0000 Subject: * cpperror.c (cpp_file_line_for_message): Constify a char*. * cppexp.c (parse_number, parse_charconst, cpp_lex, cpp_parse_expr): Add static prototypes. (parse_charconst): Don't cast away const-ness. (token): Constify a char*. * cppfiles.c (file_name_list, include_hash, find_include_file, finclude, initialize_input_buffer): Constify a char*. (file_cleanup, find_position): Add static prototypes. * cpphash.c (macro_cleanup, macarg, timestamp, special_symbol, collect_expansion): Add static prototypes. (cpp_install, create_definition, monthnames): Constify a char*. * cpphash.h (cpp_install): Likewise. * cppinit.c (known_suffixes, default_include, dump_special_to_buffer, NAME, cpp_start_read, cpp_finish): Likewise. (base_name, dump_special_to_buffer, initialize_dependency_output): Add static prototypes. * cpplib.c (my_strerror): Constify a char*. (null_underflow, null_cleanup, skip_comment, copy_comment, copy_rest_of_line, handle_directive, pass_thru_directive, get_directive_token, read_line_number, cpp_print_file_and_line, v_cpp_error, v_cpp_warning, v_cpp_error_with_line, v_cpp_warning_with_line, detect_if_not_defined, consider_directive_while_skipping): Add static prototypes. (pass_thru_directive, check_macro_name, cpp_expand_to_buffer, cpp_pedwarn_with_file_and_line): Constify a char*. * cpplib.h (cpp_options, include_hash, progname, definition, cpp_pedwarn_with_file_and_line, cpp_expand_to_buffer, check_macro_name, cpp_pfatal_with_name, cpp_file_line_for_message, find_include_file, deps_output, include_hash): Constify a char*. * cppmain.c (progname): Constify. (main): Add prototype. Use return, not exit. * fix-header.c (fatal, add_symbols, lookup_std_proto, write_lbrac, recognized_macro, check_macro_names, read_scan_file, write_rbrac, inf_skip_spaces, inf_read_upto, inf_scan_ident, inf_scan_ident, check_protection): Add static prototype. (xfree): Remove. (progname, recognized_macrom, recognized_extern): Constify a char*. (main): Add prototype. * gen-protos.c (progname): Constify a char*. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29171 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cppinit.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gcc/cppinit.c') diff --git a/gcc/cppinit.c b/gcc/cppinit.c index f0088e37180..e7d1426ccd5 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -85,7 +85,7 @@ extern char *version_string; #endif /* Suffix for object files, and known input-file extensions. */ -static char *known_suffixes[] = +static const char * const known_suffixes[] = { ".c", ".C", ".s", ".S", ".m", ".cc", ".cxx", ".cpp", ".cp", ".c++", @@ -113,8 +113,8 @@ static char *known_suffixes[] = static struct default_include { - char *fname; /* The name of the directory. */ - char *component; /* The component containing the directory + const char *fname; /* The name of the directory. */ + const char *component; /* The component containing the directory (see update_path in prefix.c) */ int cplusplus; /* Only look here if we're compiling C++. */ int cxx_aware; /* Includes in this directory don't need to @@ -203,6 +203,9 @@ static void initialize_builtins PARAMS ((cpp_reader *)); static void append_include_chain PARAMS ((cpp_reader *, struct cpp_pending *, char *, 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 *)); /* Last argument to append_include_chain: chain to use */ enum { QUOTE = 0, BRACKET, SYSTEM, AFTER }; @@ -501,7 +504,7 @@ append_include_chain (pfile, pend, dir, path) static void dump_special_to_buffer (pfile, macro_name) cpp_reader *pfile; - char *macro_name; + const char *macro_name; { static char define_directive[] = "#define "; int macro_name_length = strlen (macro_name); @@ -614,7 +617,7 @@ static void initialize_builtins (pfile) cpp_reader *pfile; { -#define NAME(str) (U_CHAR *)str, sizeof str - 1 +#define NAME(str) (const U_CHAR *)str, sizeof str - 1 cpp_install (pfile, NAME("__TIME__"), T_TIME, 0, -1); cpp_install (pfile, NAME("__DATE__"), T_DATE, 0, -1); cpp_install (pfile, NAME("__FILE__"), T_FILE, 0, -1); @@ -938,8 +941,8 @@ cpp_start_read (pfile, fname) || (opts->cplusplus && !opts->no_standard_cplusplus_includes)) { - char *str = (char *) update_path (p->fname, p->component); - str = xstrdup (str); /* XXX Potential memory leak! */ + /* XXX Potential memory leak! */ + char *str = xstrdup (update_path (p->fname, p->component)); append_include_chain (pfile, opts->pending, str, SYSTEM); } } @@ -1112,7 +1115,7 @@ cpp_finish (pfile) /* Don't actually write the deps file if compilation has failed. */ if (pfile->errors == 0) { - char *deps_mode = opts->print_deps_append ? "a" : "w"; + const char *deps_mode = opts->print_deps_append ? "a" : "w"; if (opts->deps_file == 0) deps_stream = stdout; else if ((deps_stream = fopen (opts->deps_file, deps_mode)) == 0) -- cgit v1.2.1