Backout my changes in rev. 1.32 and 1.33. There is some code that depends

on the previous behaviour. This also brings strptime(3) behaviour back in line
with the other BSDs.

Approved by:	markm (mentor)

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index becdd95..f69847a 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -518,14 +518,12 @@ strptime(const char * __restrict buf, const char * __restrict fmt,
     struct tm * __restrict tm)
 {
 	char *ret;
-	time_t t;
 	int gmt;
 
 	gmt = 0;
-	memset((void*)tm, 0, sizeof(struct tm));
 	ret = _strptime(buf, fmt, tm, &gmt);
-	if (ret) {
-		t = gmt ? timegm(tm) : mktime(tm);
+	if (ret && gmt) {
+		time_t t = timegm(tm);
 		localtime_r(&t, tm);
 	}