[src/trunk]: src/external/bsd/nvi/dist/common Avoid unportable offsetof(3) ca...

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d45cfdf0d0a
branches:  trunk
changeset: 362787:2d45cfdf0d0a
user:      kamil <kamil%NetBSD.org@localhost>
date:      Mon Jun 25 17:42:34 2018 +0000

description:
Avoid unportable offsetof(3) calculation in nvi in log1.c

Detected with MKSANITIZER/UBSan.

diffstat:

 external/bsd/nvi/dist/common/log1.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 122940b63812 -r 2d45cfdf0d0a external/bsd/nvi/dist/common/log1.c
--- a/external/bsd/nvi/dist/common/log1.c       Mon Jun 25 14:29:17 2018 +0000
+++ b/external/bsd/nvi/dist/common/log1.c       Mon Jun 25 17:42:34 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: log1.c,v 1.4 2014/01/26 21:43:45 christos Exp $        */
+/*     $NetBSD: log1.c,v 1.5 2018/06/25 17:42:34 kamil 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.4 2014/01/26 21:43:45 christos Exp $");
+__RCSID("$NetBSD: log1.c,v 1.5 2018/06/25 17:42:34 kamil Exp $");
 #endif
 
 #include <sys/types.h>
@@ -88,7 +88,7 @@
     char    data[sizeof(u_char) /* type */ + sizeof(db_recno_t)];
     CHAR_T  str[1];
 } log_t;
-#define CHAR_T_OFFSET ((char *)(((log_t*)0)->str) - (char *)0)
+#define CHAR_T_OFFSET (offsetof(log_t, str))
 
 /*
  * log_init --