aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpphash.c
diff options
context:
space:
mode:
authorKaveh R. Ghazi <ghazi@caip.rutgers.edu>1999-09-07 15:41:26 +0000
committerKaveh Ghazi <ghazi@gcc.gnu.org>1999-09-07 15:41:26 +0000
commitbcc5cac9a73b8d8903cd5b7ac7e789dfb26e1a7c (patch)
tree76546e83ed4adf19eeb9f69f1c550b82ef81184e /gcc/cpphash.c
parent21cd906efe356578356ec1c36841629951681b44 (diff)
downloadgcc-bcc5cac9a73b8d8903cd5b7ac7e789dfb26e1a7c.zip
gcc-bcc5cac9a73b8d8903cd5b7ac7e789dfb26e1a7c.tar.gz
gcc-bcc5cac9a73b8d8903cd5b7ac7e789dfb26e1a7c.tar.bz2
cpperror.c (cpp_file_line_for_message): Constify a char*.
* 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*. From-SVN: r29171
Diffstat (limited to 'gcc/cpphash.c')
-rw-r--r--gcc/cpphash.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index 66fa358..c75cad1 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -34,6 +34,11 @@ static int change_newlines PARAMS ((U_CHAR *, int));
static void push_macro_expansion PARAMS ((cpp_reader *,
U_CHAR *, int, HASHNODE *));
static int unsafe_chars PARAMS ((int, int));
+static int macro_cleanup PARAMS ((cpp_buffer *, cpp_reader *));
+static enum cpp_token macarg PARAMS ((cpp_reader *, int));
+static struct tm *timestamp PARAMS ((cpp_reader *));
+static void special_symbol PARAMS ((HASHNODE *, cpp_reader *));
+
#define SKIP_WHITE_SPACE(p) do { while (is_hor_space[*p]) p++; } while (0)
#define CPP_IS_MACRO_BUFFER(PBUF) ((PBUF)->data != NULL)
@@ -61,6 +66,9 @@ struct arglist
char rest_args;
};
+static DEFINITION *collect_expansion PARAMS ((cpp_reader *, U_CHAR *, U_CHAR *,
+ int, struct arglist *));
+
/* This structure represents one parsed argument in a macro call.
`raw' points to the argument text as written (`raw_length' is its length).
`expanded' points to the argument's macro-expansion
@@ -203,7 +211,7 @@ delete_macro (hp)
HASHNODE *
cpp_install (pfile, name, len, type, value, hash)
cpp_reader *pfile;
- U_CHAR *name;
+ const U_CHAR *name;
int len;
enum node_type type;
const char *value;
@@ -211,7 +219,7 @@ cpp_install (pfile, name, len, type, value, hash)
{
register HASHNODE *hp;
register int i, bucket;
- register U_CHAR *p;
+ register const U_CHAR *p;
if (len < 0)
{
@@ -594,7 +602,8 @@ create_definition (buf, limit, pfile, predefinition)
int sym_length; /* and how long it is */
int rest_args = 0;
long line, col;
- char *file = CPP_BUFFER (pfile) ? CPP_BUFFER (pfile)->nominal_fname : "";
+ const char *file =
+ CPP_BUFFER (pfile) ? CPP_BUFFER (pfile)->nominal_fname : "";
DEFINITION *defn;
int arglengths = 0; /* Accumulate lengths of arg names
plus number of args. */
@@ -883,7 +892,7 @@ timestamp (pfile)
return pfile->timebuf;
}
-static char *monthnames[] =
+static const char * const monthnames[] =
{
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",