From deec0760ffe3a527681aee7d6af987c5fae3df3d Mon Sep 17 00:00:00 2001
From: kevans <kevans@FreeBSD.org>
Date: Wed, 20 Feb 2019 19:05:58 +0000
Subject: [PATCH] MFC r304850, r305480, r324550-r324551, r324655, r324684:
 correct mis-merge

Some of these commits were improperly MFC'd in the sys/boot => stand
mega-MFC, others were simply missed. Correct that mistake now by manually
merging the few that were missed and record-only merge on the others.

r304850:
Unused variables and cstyle fix for loader dosfs

r305480:
Renumber the advertising clause.

r324550:
Add $FreeBSD$ to ancient sources that it's missing from.

r324551:
Move lib/libstand to sys/boot/libsa

Move the sources to sys/boot. Make adjustments related to the
move. Kill LIBSTAND_SRC since it's no longer needed.

r324655:
Remove the libstand directory which is now empty.

r324684:
Remove lib/libstand again, accidentally readded in r324683
---
 stand/libsa/bootparam.h | 1 +
 stand/libsa/dosfs.c     | 4 ++--
 stand/libsa/tftp.h      | 1 +
 stand/libsa/ufs.c       | 2 +-
 sys/ufs/ffs/fs.h        | 2 +-
 sys/ufs/ufs/dir.h       | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/stand/libsa/bootparam.h b/stand/libsa/bootparam.h
index 6f0c773a075..9c9f50ea434 100644
--- a/stand/libsa/bootparam.h
+++ b/stand/libsa/bootparam.h
@@ -1,4 +1,5 @@
 /*	$NetBSD: bootparam.h,v 1.3 1998/01/05 19:19:41 perry Exp $	*/
+/*	$FreeBSD$ */
 
 int bp_whoami(int sock);
 int bp_getfile(int sock, char *key, struct in_addr *addrp, char *path);
diff --git a/stand/libsa/dosfs.c b/stand/libsa/dosfs.c
index 6bbe961dccc..68762842eae 100644
--- a/stand/libsa/dosfs.c
+++ b/stand/libsa/dosfs.c
@@ -426,7 +426,7 @@ dos_readdir(struct open_file *fd, struct dirent *d)
     u_char fn[261];
     DOS_DIR dd;
     size_t res;
-    u_int chk, i, x, xdn;
+    u_int chk, x, xdn;
     int err;
 
     x = chk = 0;
@@ -585,7 +585,7 @@ lookup(DOS_FS *fs, u_int clus, const char *name, DOS_DE **dep)
     u_char lfn[261];
     u_char sfn[13];
     u_int nsec, lsec, xdn, chk, sec, ent, x;
-    int err, ok, i;
+    int err, ok;
 
     if (!clus)
         for (ent = 0; ent < 2; ent++)
diff --git a/stand/libsa/tftp.h b/stand/libsa/tftp.h
index cbbbbd78212..c56fb81aafa 100644
--- a/stand/libsa/tftp.h
+++ b/stand/libsa/tftp.h
@@ -30,6 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ * $FreeBSD$
  */
 
 
diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c
index b6ad668e306..547e8698247 100644
--- a/stand/libsa/ufs.c
+++ b/stand/libsa/ufs.c
@@ -24,7 +24,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 35ee27039bd..3bb7c58c5fb 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index 574a32f9e7f..b94d64a784b 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -15,7 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
-- 
2.45.0