diff options
author | Zack Weinberg <zack@gcc.gnu.org> | 2000-03-07 23:11:06 +0000 |
---|---|---|
committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-03-07 23:11:06 +0000 |
commit | e23c0ba36fe2be2c8bd601828b9acd16e7ec20cb (patch) | |
tree | a31f6a5cd8330056644174c9c5293dea5cb41041 /gcc/mkdeps.c | |
parent | 28c231d6479bb046652cf9dbd2e8fb5c88910952 (diff) | |
download | gcc-e23c0ba36fe2be2c8bd601828b9acd16e7ec20cb.zip gcc-e23c0ba36fe2be2c8bd601828b9acd16e7ec20cb.tar.gz gcc-e23c0ba36fe2be2c8bd601828b9acd16e7ec20cb.tar.bz2 |
[multiple changes]
2000-03-07 Neil Booth <NeilB@earthling.net>
* cppexp.c (struct operation, left_shift, right_shift,
cpp_parse_expr): Change some "char"s to "U_CHAR"s, and some
"int"s to "unsigned int"s.
* cpplib.c (detect_if_not_defined, do_assert, do_unassert):
Similarly.
* cpplib.h: Update for above.
* mkdeps.c (deps_init, deps_calc_target): Cast pointers
returned from allocations.
* cppinit.c (opt_comp, parse_options): New functions.
(handle_option): Use parse_option to parse a single command
line option, that possibly takes an argument.
(cpp_handle_options): Sort the array of command line options on
first invocation (non-ASCII hosts only).
(print_help): Update.
2000-03-07 Zack Weinberg <zack@wolery.cumb.org>
* mkdeps.c (munge): Fix off-by-one bug and inconsistencies in
backslash counting loops. Problem noted by Matt Kraai <kraai@ghs.com>.
From-SVN: r32394
Diffstat (limited to 'gcc/mkdeps.c')
-rw-r--r-- | gcc/mkdeps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/mkdeps.c b/gcc/mkdeps.c index b4b1257..4ec0dc7 100644 --- a/gcc/mkdeps.c +++ b/gcc/mkdeps.c @@ -58,7 +58,7 @@ munge (filename) preceded by 2N backslashes represents N backslashes at the end of a file name; and backslashes in other contexts should not be doubled. */ - for (q = p - 1; q < filename && q[-1] == '\\'; q--) + for (q = p - 1; filename <= q && *q == '\\'; q--) len++; len++; break; @@ -80,7 +80,7 @@ munge (filename) { case ' ': case '\t': - for (q = p - 1; filename < q && q[-1] == '\\'; q--) + for (q = p - 1; filename <= q && *q == '\\'; q--) *dst++ = '\\'; *dst++ = '\\'; break; @@ -135,8 +135,8 @@ deps_init () /* Allocate space for the vectors now. */ - d->targetv = xmalloc (2 * sizeof (const char *)); - d->depv = xmalloc (8 * sizeof (const char *)); + d->targetv = (const char **) xmalloc (2 * sizeof (const char *)); + d->depv = (const char **) xmalloc (8 * sizeof (const char *)); d->ntargets = 0; d->targets_size = 2; @@ -188,7 +188,7 @@ deps_calc_target (d, t) char *o, *suffix; t = base_name (t); - o = alloca (strlen (t) + 8); + o = (char *) alloca (strlen (t) + 8); strcpy (o, t); suffix = strrchr (o, '.'); |