summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--implicit.c8
-rw-r--r--job.c7
2 files changed, 5 insertions, 10 deletions
diff --git a/implicit.c b/implicit.c
index fce9c89..d414676 100644
--- a/implicit.c
+++ b/implicit.c
@@ -221,9 +221,6 @@ pattern_search (struct file *file, int archive,
= xmalloc (max_pattern_deps * sizeof (struct patdeps));
struct patdeps *pat = deplist;
- /* All the prerequisites actually found for a rule, after expansion. */
- struct dep *deps;
-
/* Names of possible dependencies are constructed in this buffer. */
char *depname = alloca (namelen + max_pattern_dep_length);
@@ -800,10 +797,7 @@ pattern_search (struct file *file, int archive,
/* This pattern rule does apply. Stop looking for one. */
break;
- /* This pattern rule does not apply. If some of its dependencies
- succeeded, free the data structure describing them. */
- /* free_idep_chain (deps); */
- deps = 0;
+ /* This pattern rule does not apply. Keep looking. */
}
/* If we found an applicable rule without intermediate files, don't try
diff --git a/job.c b/job.c
index 941cf21..07d70c7 100644
--- a/job.c
+++ b/job.c
@@ -2199,14 +2199,15 @@ new_job (struct file *file)
if (trace_flag)
{
char *newer = allocated_variable_expand_for_file ("$?", c->file);
- char *nm;
+ const char *nm;
if (! cmds->fileinfo.filenm)
nm = _("<builtin>");
else
{
- nm = alloca (strlen (cmds->fileinfo.filenm) + 1 + 11 + 1);
- sprintf (nm, "%s:%lu", cmds->fileinfo.filenm, cmds->fileinfo.lineno);
+ char *n = alloca (strlen (cmds->fileinfo.filenm) + 1 + 11 + 1);
+ sprintf (n, "%s:%lu", cmds->fileinfo.filenm, cmds->fileinfo.lineno);
+ nm = n;
}
if (newer[0] == '\0')