Module Name: src
Committed By: rin
Date: Wed Jul 24 08:37:59 UTC 2019
Modified Files:
src/external/bsd/nvi/dist/common: log.c log1.c
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Add missing break.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nvi/dist/common/log.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/common/log1.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/nvi/usr.bin/nvi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/common/log.c
diff -u src/external/bsd/nvi/dist/common/log.c:1.5 src/external/bsd/nvi/dist/common/log.c:1.6
--- src/external/bsd/nvi/dist/common/log.c:1.5 Sat Jun 16 21:00:12 2018
+++ src/external/bsd/nvi/dist/common/log.c Wed Jul 24 08:37:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.5 2018/06/16 21:00:12 kamil Exp $ */
+/* $NetBSD: log.c,v 1.6 2019/07/24 08:37:59 rin Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = "Id: log.c,v 10.26 2002/03/02 23:12:13 skimo Exp (Berkeley) Date: 2002/03/02 23:12:13 ";
#endif /* not lint */
#else
-__RCSID("$NetBSD: log.c,v 1.5 2018/06/16 21:00:12 kamil Exp $");
+__RCSID("$NetBSD: log.c,v 1.6 2019/07/24 08:37:59 rin Exp $");
#endif
#include <sys/types.h>
@@ -620,6 +620,7 @@ log_setline(SCR *sp)
sp->rptlchange = lno;
++sp->rptlines[L_CHANGED];
}
+ break;
case LOG_MARK:
memmove(&lm, p + sizeof(u_char), sizeof(LMARK));
m.lno = lm.lno;
Index: src/external/bsd/nvi/dist/common/log1.c
diff -u src/external/bsd/nvi/dist/common/log1.c:1.6 src/external/bsd/nvi/dist/common/log1.c:1.7
--- src/external/bsd/nvi/dist/common/log1.c:1.6 Mon Jun 25 18:36:36 2018
+++ src/external/bsd/nvi/dist/common/log1.c Wed Jul 24 08:37:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: log1.c,v 1.6 2018/06/25 18:36:36 kamil Exp $ */
+/* $NetBSD: log1.c,v 1.7 2019/07/24 08:37:59 rin Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = "Id: log.c,v 10.26 2002/03/02 23:12:13 skimo Exp (Berkeley) Date: 2002/03/02 23:12:13 ";
#endif /* not lint */
#else
-__RCSID("$NetBSD: log1.c,v 1.6 2018/06/25 18:36:36 kamil Exp $");
+__RCSID("$NetBSD: log1.c,v 1.7 2019/07/24 08:37:59 rin Exp $");
#endif
#include <sys/types.h>
@@ -588,6 +588,7 @@ log_setline(SCR *sp)
sp->rptlchange = lno;
++sp->rptlines[L_CHANGED];
}
+ break;
case LOG_MARK:
memmove(&lm, p + sizeof(u_char), sizeof(LMARK));
m.lno = lm.lno;
Index: src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.18 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.19
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.18 Mon Feb 4 04:05:16 2019
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Wed Jul 24 08:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/02/04 04:05:16 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2019/07/24 08:37:59 rin Exp $
.include <bsd.own.mk>
@@ -18,10 +18,6 @@ CWARNFLAGS.gcc+= -Wno-unused
CWARNFLAGS.clang+= -Wno-unsequenced
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
-COPTS.log1.c+= -Wno-error=implicit-fallthrough
-.endif
-
CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I.
CPPFLAGS+=-DGTAGS -DIMCTRL
CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H
