From bd001d86d679e10d179ef00b9866f0e65b6fa7fd Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 30 Apr 2022 07:33:15 -0600
Subject: [PATCH] stand: s/libstand/libsa/g to catch up with rename

We renamed libstand to libsa years ago with the move from sys/boot to
stand. Catch up in the comments.

Sponsored by:		Netflix
---
 stand/efi/boot1/Makefile          | 2 +-
 stand/efi/libefi/wchar.c          | 2 +-
 stand/i386/libi386/time.c         | 2 +-
 stand/i386/loader/conf.c          | 2 +-
 stand/kboot/arch/powerpc64/conf.c | 2 +-
 stand/libsa/stand.h               | 4 ++--
 stand/libsa/zfs/zstd_shim.c       | 2 +-
 stand/powerpc/ofw/conf.c          | 2 +-
 stand/uboot/arch/powerpc/conf.c   | 2 +-
 stand/userboot/userboot/conf.c    | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
index 7e3d762c768d..daedc627e5dc 100644
--- a/stand/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
@@ -82,7 +82,7 @@ LDFLAGS+=	-Wl,-znocombreloc
 LIBEFI=		${BOOTOBJ}/efi/libefi/libefi.a
 
 #
-# Add libstand for the runtime functions used by the compiler - for example
+# Add libsa for the runtime functions used by the compiler - for example
 # __aeabi_* (arm) or __divdi3 (i386).
 # as well as required string and memory functions for all platforms.
 #
diff --git a/stand/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c
index 0a2b96b64f45..d0c653514366 100644
--- a/stand/efi/libefi/wchar.c
+++ b/stand/efi/libefi/wchar.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
 
 /*
  * CHAR16 related functions moved from loader.
- * Perhaps we should move those to libstand afterall, but they are
+ * Perhaps we should move those to libsa afterall, but they are
  * needed only by UEFI.
  */
 
diff --git a/stand/i386/libi386/time.c b/stand/i386/libi386/time.c
index 7636ace5ff94..5b8a9c9017a7 100644
--- a/stand/i386/libi386/time.c
+++ b/stand/i386/libi386/time.c
@@ -38,7 +38,7 @@ static int	bios_seconds(void);
 /*
  * Return the BIOS time-of-day value.
  *
- * XXX uses undocumented BCD support from libstand.
+ * XXX uses undocumented BCD support from libsa.
  */
 static int
 bios_seconds(void)
diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c
index c70a53d4191a..35052b5423cd 100644
--- a/stand/i386/loader/conf.c
+++ b/stand/i386/loader/conf.c
@@ -50,7 +50,7 @@ extern struct devsw fwohci;
 #endif
 extern struct devsw vdisk_dev;
 
-/* Exported for libstand */
+/* Exported for libsa */
 struct devsw *devsw[] = {
     &biosfd,
     &bioscd,
diff --git a/stand/kboot/arch/powerpc64/conf.c b/stand/kboot/arch/powerpc64/conf.c
index 22562e898ef1..9862611c68d8 100644
--- a/stand/kboot/arch/powerpc64/conf.c
+++ b/stand/kboot/arch/powerpc64/conf.c
@@ -45,7 +45,7 @@ extern struct devsw hostdisk;
  * XXX rename these arrays to be consistent and less namespace-hostile
  */
 
-/* Exported for libstand */
+/* Exported for libsa */
 struct devsw *devsw[] = {
 #if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
     &hostdisk,
diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h
index 99b55e2282e4..097d8ba28d0b 100644
--- a/stand/libsa/stand.h
+++ b/stand/libsa/stand.h
@@ -117,7 +117,7 @@ struct fs_ops {
 };
 
 /*
- * libstand-supplied filesystems
+ * libsa-supplied filesystems
  */
 extern struct fs_ops ufs_fsops;
 extern struct fs_ops tftp_fsops;
@@ -159,7 +159,7 @@ struct devsw {
 };
 
 /*
- * libstand-supplied device switch
+ * libsa-supplied device switch
  */
 extern struct devsw netdev;
 
diff --git a/stand/libsa/zfs/zstd_shim.c b/stand/libsa/zfs/zstd_shim.c
index 91f5171a72b5..b1ba4babcf36 100644
--- a/stand/libsa/zfs/zstd_shim.c
+++ b/stand/libsa/zfs/zstd_shim.c
@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
 
 /*
  * Small amount of shim code needed to get zfs_zstd.c to compile. These items
- * here should all be defined in the SPL or as part of libstand somewhere, but
+ * here should all be defined in the SPL or as part of libsa somewhere, but
  * aren't for reasons that haven't been tracked down yet. Ideally, they would
  * all go away and we'd compile zfs_zstd.c directly. Based on an original by
  * Matt Macey, but only the #include remains untouched from that.
diff --git a/stand/powerpc/ofw/conf.c b/stand/powerpc/ofw/conf.c
index a7ac892e71fc..a472faeed97b 100644
--- a/stand/powerpc/ofw/conf.c
+++ b/stand/powerpc/ofw/conf.c
@@ -48,7 +48,7 @@ void (*exitfn)(int) = exit;
  * XXX rename these arrays to be consistent and less namespace-hostile
  */
 
-/* Exported for libstand */
+/* Exported for libsa */
 struct devsw *devsw[] = {
 #if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
     &ofwdisk,
diff --git a/stand/uboot/arch/powerpc/conf.c b/stand/uboot/arch/powerpc/conf.c
index 49658a47cbd4..1ace9b5e53de 100644
--- a/stand/uboot/arch/powerpc/conf.c
+++ b/stand/uboot/arch/powerpc/conf.c
@@ -47,7 +47,7 @@ void (*exitfn)(int) = exit;
  * XXX rename these arrays to be consistent and less namespace-hostile
  */
 
-/* Exported for libstand */
+/* Exported for libsa */
 struct devsw *devsw[] = {
 #if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
     &uboot_storage,
diff --git a/stand/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c
index af63528163d5..3762be5332ec 100644
--- a/stand/userboot/userboot/conf.c
+++ b/stand/userboot/userboot/conf.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
  * XXX rename these arrays to be consistent and less namespace-hostile
  */
 
-/* Exported for libstand */
+/* Exported for libsa */
 struct devsw *devsw[] = {
 	&host_dev,
 	&userboot_disk,