summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2009-09-16 17:07:01 +0000
committerPaul Smith <psmith@gnu.org>2009-09-16 17:07:01 +0000
commit6e57418f74e81d1385d41d0dc239fb608526be52 (patch)
tree78e7e64f0c47dff023bebe15ee57b85f8db6a826 /file.c
parent580b4c5cc99fc5e04b5bd314d1e4c4cd7e13a35c (diff)
downloadmake-6e57418f74e81d1385d41d0dc239fb608526be52.tar.gz
- Add xcalloc() and call it
- Fix memory errors found by valgrind - Remove multi_glob() and empower parse_file_seq() to do its job: the goal here is to remove the confusing reverse/re-reverse we do on the file lists: needed for future fixes. - Add a prefix arg to parse_file_seq() - Make concat() variadic so it can take arbitrary #'s of strings
Diffstat (limited to 'file.c')
-rw-r--r--file.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/file.c b/file.c
index a618bebc..4e3bece1 100644
--- a/file.c
+++ b/file.c
@@ -415,8 +415,7 @@ struct dep *
parse_prereqs (char *p)
{
struct dep *new = (struct dep *)
- multi_glob (parse_file_seq (&p, '|', sizeof (struct dep), 1),
- sizeof (struct dep), 0);
+ parse_file_seq (&p, sizeof (struct dep), '|', NULL, 0);
if (*p)
{
@@ -426,8 +425,7 @@ parse_prereqs (char *p)
++p;
ood = (struct dep *)
- multi_glob (parse_file_seq (&p, '\0', sizeof (struct dep), 1),
- sizeof (struct dep), 0);
+ parse_file_seq (&p, sizeof (struct dep), '\0', NULL, 0);
if (! new)
new = ood;