Module Name: src
Committed By: rin
Date: Wed Dec 13 06:43:46 UTC 2017
Modified Files:
src/lib/libc/gen: fmtcheck.c
Log Message:
Revert change made by rev 1.11; now, fmtcheck(3) does not complain about
unused trailing arguments as before.
See also discussion on tech-userland:
http://mail-index.netbsd.org/tech-userlevel/2017/12/07/msg011019.html
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/fmtcheck.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/fmtcheck.c
diff -u src/lib/libc/gen/fmtcheck.c:1.15 src/lib/libc/gen/fmtcheck.c:1.16
--- src/lib/libc/gen/fmtcheck.c:1.15 Wed Dec 6 14:05:14 2017
+++ src/lib/libc/gen/fmtcheck.c Wed Dec 13 06:43:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fmtcheck.c,v 1.15 2017/12/06 14:05:14 rin Exp $ */
+/* $NetBSD: fmtcheck.c,v 1.16 2017/12/13 06:43:45 rin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fmtcheck.c,v 1.15 2017/12/06 14:05:14 rin Exp $");
+__RCSID("$NetBSD: fmtcheck.c,v 1.16 2017/12/13 06:43:45 rin Exp $");
#endif
#include "namespace.h"
@@ -344,8 +344,5 @@ fmtcheck(const char *f1, const char *f2)
if (f1t != f2t)
return f2;
}
- if (get_next_format(&f2p, f2t) != FMTCHECK_DONE)
- return f2;
- else
- return f1;
+ return f1;
}
