mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-12-24 12:58:40 +00:00
Formerly file.c.~17~
This commit is contained in:
parent
b732b99c0b
commit
3241a91312
1 changed files with 5 additions and 27 deletions
32
file.c
32
file.c
|
@ -142,10 +142,11 @@ rename_file (file, name)
|
|||
}
|
||||
|
||||
void
|
||||
file_hash_enter (file, name, oldhash)
|
||||
file_hash_enter (file, name, oldhash, oldname)
|
||||
register struct file *file;
|
||||
char *name;
|
||||
unsigned int oldhash;
|
||||
char *oldname;
|
||||
{
|
||||
register unsigned int newhash;
|
||||
struct file *oldfile;
|
||||
|
@ -213,16 +214,16 @@ file_hash_enter (file, name, oldhash)
|
|||
makefile_error (file->cmds->filename, file->cmds->lineno,
|
||||
"Commands were specified for \
|
||||
file `%s' at %s:%u,",
|
||||
oldfile->name, oldfile->cmds->filename,
|
||||
oldname, oldfile->cmds->filename,
|
||||
oldfile->cmds->lineno);
|
||||
makefile_error (file->cmds->filename, file->cmds->lineno,
|
||||
"but `%s' is now considered the same file \
|
||||
as `%s'.",
|
||||
oldfile->name, name);
|
||||
oldname, name);
|
||||
makefile_error (file->cmds->filename, file->cmds->lineno,
|
||||
"Commands for `%s' will be ignored \
|
||||
in favor of those for `%s'.",
|
||||
name, oldfile->name);
|
||||
name, oldname);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -490,26 +491,3 @@ print_file_data_base ()
|
|||
#endif
|
||||
}
|
||||
}
|
||||
/* !!! compile frob */
|
||||
struct file *
|
||||
file_linear_list ()
|
||||
{
|
||||
register unsigned int bucket;
|
||||
register struct file *f, *nextf;
|
||||
struct file *chain = NULL;
|
||||
|
||||
for (bucket = 0; bucket < sizeof (files) / sizeof (files[0]); ++bucket)
|
||||
for (f = files[bucket]; f != NULL; f = nextf)
|
||||
{
|
||||
nextf = f->next;
|
||||
if (f->is_target)
|
||||
{
|
||||
if (f->cmds != NULL)
|
||||
f->cmds = (struct commands *) f->cmds->commands;
|
||||
f->next = chain;
|
||||
chain = f;
|
||||
}
|
||||
}
|
||||
|
||||
return chain;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue