Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): clean up VarStrftime
details: https://anonhg.NetBSD.org/src/rev/5685fbbccac6
branches: trunk
changeset: 1012702:5685fbbccac6
user: rillig <rillig%NetBSD.org@localhost>
date: Sat Aug 08 13:05:24 2020 +0000
description:
make(1): clean up VarStrftime
The parameter names were confusing and had outdated types.
diffstat:
usr.bin/make/var.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diffs (64 lines):
diff -r 0b5d4436c8da -r 5685fbbccac6 usr.bin/make/var.c
--- a/usr.bin/make/var.c Sat Aug 08 13:03:13 2020 +0000
+++ b/usr.bin/make/var.c Sat Aug 08 13:05:24 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.424 2020/08/08 13:03:13 rillig Exp $ */
+/* $NetBSD: var.c,v 1.425 2020/08/08 13:05:24 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.424 2020/08/08 13:03:13 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.425 2020/08/08 13:05:24 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.424 2020/08/08 13:03:13 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.425 2020/08/08 13:05:24 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1849,15 +1849,15 @@
}
static char *
-VarStrftime(const char *fmt, int zulu, time_t utc)
+VarStrftime(const char *fmt, Boolean zulu, time_t tim)
{
char buf[BUFSIZ];
- if (!utc)
- time(&utc);
+ if (!tim)
+ time(&tim);
if (!*fmt)
fmt = "%c";
- strftime(buf, sizeof(buf), fmt, zulu ? gmtime(&utc) : localtime(&utc));
+ strftime(buf, sizeof(buf), fmt, zulu ? gmtime(&tim) : localtime(&tim));
buf[sizeof(buf) - 1] = '\0';
return bmake_strdup(buf);
@@ -2061,7 +2061,7 @@
utc = 0;
*pp = mod + 6;
}
- st->newVal = VarStrftime(st->val, 1, utc);
+ st->newVal = VarStrftime(st->val, TRUE, utc);
return AMR_OK;
}
@@ -2083,7 +2083,7 @@
utc = 0;
*pp = mod + 9;
}
- st->newVal = VarStrftime(st->val, 0, utc);
+ st->newVal = VarStrftime(st->val, FALSE, utc);
return AMR_OK;
}
Home |
Main Index |
Thread Index |
Old Index