[src/trunk]: src Track down and fix two missing uses of SEGSUM_FINFOBASE().

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

details:   https://anonhg.NetBSD.org/src/rev/1b327f27b317
branches:  trunk
changeset: 340921:1b327f27b317
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Oct 10 22:34:09 2015 +0000

description:
Track down and fix two missing uses of SEGSUM_FINFOBASE().

diffstat:

 sbin/fsck_lfs/lfs.c        |  4 ++--
 usr.sbin/dumplfs/dumplfs.c |  7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 2d334dc74240 -r 1b327f27b317 sbin/fsck_lfs/lfs.c
--- a/sbin/fsck_lfs/lfs.c       Sat Oct 10 22:33:57 2015 +0000
+++ b/sbin/fsck_lfs/lfs.c       Sat Oct 10 22:34:09 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.67 2015/10/03 08:29:48 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.68 2015/10/10 22:34:09 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -791,7 +791,7 @@
 
        iip = iibase;
        daddr = pseg_addr + lfs_btofsb(fs, lfs_sb_getsumsize(fs));
-       fp = (FINFO *) (sp + 1);
+       fp = SEGSUM_FINFOBASE(fs, sp);
        for (i = 0, j = 0;
             i < lfs_ss_getnfinfo(fs, sp) || j < howmany(lfs_ss_getninos(fs, sp), LFS_INOPB(fs)); i++) {
                if (i >= lfs_ss_getnfinfo(fs, sp) && lfs_ii_getblock(fs, iip) != daddr) {
diff -r 2d334dc74240 -r 1b327f27b317 usr.sbin/dumplfs/dumplfs.c
--- a/usr.sbin/dumplfs/dumplfs.c        Sat Oct 10 22:33:57 2015 +0000
+++ b/usr.sbin/dumplfs/dumplfs.c        Sat Oct 10 22:34:09 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumplfs.c,v 1.59 2015/10/03 08:28:56 dholland Exp $    */
+/*     $NetBSD: dumplfs.c,v 1.60 2015/10/10 22:34:09 dholland Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)dumplfs.c  8.5 (Berkeley) 5/24/95";
 #else
-__RCSID("$NetBSD: dumplfs.c,v 1.59 2015/10/03 08:28:56 dholland Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.60 2015/10/10 22:34:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -622,11 +622,10 @@
         * to prevent us from continuing, but it odes merit a warning.)
         */
        iip2 = SEGSUM_IINFOSTART(lfsp, sp);
+       fp = SEGSUM_FINFOBASE(lfsp, sp);
        if (lfs_sb_getversion(lfsp) == 1) {
-               fp = (FINFO *)((SEGSUM_V1 *)sp + 1);
                el_size = sizeof(unsigned long);
        } else {
-               fp = (FINFO *)(sp + 1);
                el_size = sizeof(u_int32_t);
        }
        datap = (char *)malloc(el_size * numblocks);