svn commit: r344376 - in stable/11: stand/libsa sys/ufs/ffs sys/ufs/ufs

[Kyle Evans]

Author: kevans
Date: Wed Feb 20 19:05:58 2019
New Revision: 344376
URL: https://svnweb.freebsd.org/changeset/base/344376

Log:
  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

Modified:
  stable/11/stand/libsa/bootparam.h
  stable/11/stand/libsa/dosfs.c
  stable/11/stand/libsa/tftp.h
  stable/11/stand/libsa/ufs.c
  stable/11/sys/ufs/ffs/fs.h
  stable/11/sys/ufs/ufs/dir.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/libsa/bootparam.h
==============================================================================
--- stable/11/stand/libsa/bootparam.h	Wed Feb 20 18:48:36 2019	(r344375)
+++ stable/11/stand/libsa/bootparam.h	Wed Feb 20 19:05:58 2019	(r344376)
@@ -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);

Modified: stable/11/stand/libsa/dosfs.c
==============================================================================
--- stable/11/stand/libsa/dosfs.c	Wed Feb 20 18:48:36 2019	(r344375)
+++ stable/11/stand/libsa/dosfs.c	Wed Feb 20 19:05:58 2019	(r344376)
@@ -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_D
     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++)

Modified: stable/11/stand/libsa/tftp.h
==============================================================================
--- stable/11/stand/libsa/tftp.h	Wed Feb 20 18:48:36 2019	(r344375)
+++ stable/11/stand/libsa/tftp.h	Wed Feb 20 19:05:58 2019	(r344376)
@@ -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$
  */
 
 

Modified: stable/11/stand/libsa/ufs.c
==============================================================================
--- stable/11/stand/libsa/ufs.c	Wed Feb 20 18:48:36 2019	(r344375)
+++ stable/11/stand/libsa/ufs.c	Wed Feb 20 19:05:58 2019	(r344376)
@@ -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.
  *

Modified: stable/11/sys/ufs/ffs/fs.h
==============================================================================
--- stable/11/sys/ufs/ffs/fs.h	Wed Feb 20 18:48:36 2019	(r344375)
+++ stable/11/sys/ufs/ffs/fs.h	Wed Feb 20 19:05:58 2019	(r344376)
@@ -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.
  *

Modified: stable/11/sys/ufs/ufs/dir.h
==============================================================================
--- stable/11/sys/ufs/ufs/dir.h	Wed Feb 20 18:48:36 2019	(r344375)
+++ stable/11/sys/ufs/ufs/dir.h	Wed Feb 20 19:05:58 2019	(r344376)
@@ -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.
  *