Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): use Hash API from dir.c

Browse Source 
When the Hash struct fields are renamed the next time, this should not
influence any code outside hash.h and hash.c.
This commit is contained in:
rillig 2020-09-02 03:15:21 +00:00
parent 4c244afec7
commit 2626dad6cf
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/make/dir.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dir.c,v 1.130 2020/09/01 21:11:31 rillig Exp $ */
/* $NetBSD: dir.c,v 1.131 2020/09/02 03:15:21 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: dir.c,v 1.130 2020/09/01 21:11:31 rillig Exp $";
static char rcsid[] = "$NetBSD: dir.c,v 1.131 2020/09/02 03:15:21 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
__RCSID("$NetBSD: dir.c,v 1.130 2020/09/01 21:11:31 rillig Exp $");
__RCSID("$NetBSD: dir.c,v 1.131 2020/09/02 03:15:21 rillig Exp $");
#endif
#endif /* not lint */
#endif
@ -298,7 +298,7 @@ cached_stats(Hash_Table *htp, const char *pathname, struct stat *st,
entry = Hash_FindEntry(htp, pathname);
if (entry && !(flags & CST_UPDATE)) {
cst = entry->value;
cst = Hash_GetValue(entry);
memset(st, 0, sizeof(*st));
st->st_mode = cst->mode;
@ -317,13 +317,13 @@ cached_stats(Hash_Table *htp, const char *pathname, struct stat *st,
if (st->st_mtime == 0)
st->st_mtime = 1; /* avoid confusion with missing file */
if (!entry)
if (entry == NULL)
entry = Hash_CreateEntry(htp, pathname, NULL);
if (!entry->value) {
entry->value = bmake_malloc(sizeof(*cst));
memset(entry->value, 0, sizeof(*cst));
if (Hash_GetValue(entry) == NULL) {
Hash_SetValue(entry, bmake_malloc(sizeof(*cst)));
memset(Hash_GetValue(entry), 0, sizeof(*cst));
}
cst = entry->value;
cst = Hash_GetValue(entry);
if (flags & CST_LSTAT) {
cst->lmtime = st->st_mtime;
} else {