[src/trunk]: src/usr.sbin/makefs/ffs Revert the part of mkfs.c 1.36 that "gut...

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

details:   https://anonhg.NetBSD.org/src/rev/56f088d2dccc
branches:  trunk
changeset: 821554:56f088d2dccc
user:      kre <kre%NetBSD.org@localhost>
date:      Thu Feb 09 04:42:53 2017 +0000

description:
Revert the part of mkfs.c 1.36 that "gutted the const" (while
retaining the part that added a different one).

That is, re-constipate makefs (well, just a bit, no real pain here.)

diffstat:

 usr.sbin/makefs/ffs/ffs_extern.h |  4 ++--
 usr.sbin/makefs/ffs/mkfs.c       |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r a16505f62fdd -r 56f088d2dccc usr.sbin/makefs/ffs/ffs_extern.h
--- a/usr.sbin/makefs/ffs/ffs_extern.h  Thu Feb 09 04:37:35 2017 +0000
+++ b/usr.sbin/makefs/ffs/ffs_extern.h  Thu Feb 09 04:42:53 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_extern.h,v 1.6 2003/08/07 11:25:33 agc Exp $       */
+/*     $NetBSD: ffs_extern.h,v 1.7 2017/02/09 04:42:53 kre Exp $       */
 /* From: NetBSD: ffs_extern.h,v 1.19 2001/08/17 02:18:48 lukem Exp */
 
 /*-
@@ -59,7 +59,7 @@
 int ffs_balloc(struct inode *, off_t, int, struct buf **);
 
        /* ffs_bswap.c */
-void ffs_sb_swap(struct fs*, struct fs *);
+void ffs_sb_swap(const struct fs*, struct fs *);
 void ffs_dinode1_swap(struct ufs1_dinode *, struct ufs1_dinode *);
 void ffs_dinode2_swap(struct ufs2_dinode *, struct ufs2_dinode *);
 void ffs_csum_swap(struct csum *, struct csum *, int);
diff -r a16505f62fdd -r 56f088d2dccc usr.sbin/makefs/ffs/mkfs.c
--- a/usr.sbin/makefs/ffs/mkfs.c        Thu Feb 09 04:37:35 2017 +0000
+++ b/usr.sbin/makefs/ffs/mkfs.c        Thu Feb 09 04:42:53 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkfs.c,v 1.36 2017/02/08 16:00:30 christos Exp $       */
+/*     $NetBSD: mkfs.c,v 1.37 2017/02/09 04:42:53 kre Exp $    */
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -48,7 +48,7 @@
 static char sccsid[] = "@(#)mkfs.c     8.11 (Berkeley) 5/3/95";
 #else
 #ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.36 2017/02/08 16:00:30 christos Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.37 2017/02/09 04:42:53 kre Exp $");
 #endif
 #endif
 #endif /* not lint */
@@ -126,7 +126,7 @@
 static int     avgfpdir;          /* expected number of files per directory */
 
 static void
-ffs_sb_copy(struct fs *o, struct fs *i, size_t l, const fsinfo_t *fsopts)
+ffs_sb_copy(struct fs *o, const struct fs *i, size_t l, const fsinfo_t *fsopts)
 {
        memcpy(o, i, l);
        /* Zero out pointers */