summaryrefslogtreecommitdiff
path: root/lib/libc/time
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2008-10-31 14:12:18 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2008-10-31 14:12:18 +0000
commitec4dc0a93f3a701f36de82b938df618e5ecc48f8 (patch)
tree4f4e115b9b78338d0c8d70d0c652276ed4e44f8e /lib/libc/time
parentef532330e6ae69a4d7116431e4ebeb8e0dc493a4 (diff)
Pass a pointer to warn2 so the warn2 == IN_ALL would not be an
always-false condition. From FreeBSD (delphij).
Diffstat (limited to 'lib/libc/time')
-rw-r--r--lib/libc/time/strftime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index 961773e0c59..f32626af6be 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strftime.c,v 1.18 2007/12/29 22:26:51 millert Exp $ */
+/* $OpenBSD: strftime.c,v 1.19 2008/10/31 14:12:17 millert Exp $ */
#include "private.h"
/*
@@ -227,7 +227,7 @@ label:
{
int warn2 = IN_SOME;
- pt = _fmt(Locale->c_fmt, t, pt, ptlim, warnp);
+ pt = _fmt(Locale->c_fmt, t, pt, ptlim, &warn2);
if (warn2 == IN_ALL)
warn2 = IN_THIS;
if (warn2 > *warnp)