Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Jan 2021 05:59:41 GMT
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: e6d98805103c - stable/12 - syscons: scrnmaps: appease -Wmissing-variable-declarations
Message-ID:  <202101100559.10A5xfr7006691@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=e6d98805103c51dc384ad0708e66642ce4a6746f

commit e6d98805103c51dc384ad0708e66642ce4a6746f
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2021-01-01 17:53:47 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-01-10 05:59:31 +0000

    syscons: scrnmaps: appease -Wmissing-variable-declarations
    
    scrmap is only used in the one compilation unit in all cases, make it static
    rather than extern'ing it. There's little benefit, but it's easy to do.
    
    It's unclear how this hasn't failed many builds before now, since it should
    have cropped up sometime around deeper hierarchies getting a default WARNS.
    
    (cherry picked from commit fb6bc290fb342864f5362ab9cef7dd214df05cf3)
---
 share/syscons/scrnmaps/armscii8-2haik8     | 2 +-
 share/syscons/scrnmaps/iso-8859-1_to_cp437 | 2 +-
 share/syscons/scrnmaps/iso-8859-4_for_vga9 | 2 +-
 share/syscons/scrnmaps/iso-8859-7_to_cp437 | 2 +-
 share/syscons/scrnmaps/koi8-r2cp866        | 2 +-
 share/syscons/scrnmaps/koi8-u2cp866u       | 2 +-
 share/syscons/scrnmaps/us-ascii_to_cp437   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/syscons/scrnmaps/armscii8-2haik8 b/share/syscons/scrnmaps/armscii8-2haik8
index f6bc35d74701..0546204b9164 100644
--- a/share/syscons/scrnmaps/armscii8-2haik8
+++ b/share/syscons/scrnmaps/armscii8-2haik8
@@ -27,7 +27,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/share/syscons/scrnmaps/iso-8859-1_to_cp437 b/share/syscons/scrnmaps/iso-8859-1_to_cp437
index c18e62f04667..80522c4315e2 100644
--- a/share/syscons/scrnmaps/iso-8859-1_to_cp437
+++ b/share/syscons/scrnmaps/iso-8859-1_to_cp437
@@ -25,7 +25,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/share/syscons/scrnmaps/iso-8859-4_for_vga9 b/share/syscons/scrnmaps/iso-8859-4_for_vga9
index e096bdcd771e..5afbe36ee397 100644
--- a/share/syscons/scrnmaps/iso-8859-4_for_vga9
+++ b/share/syscons/scrnmaps/iso-8859-4_for_vga9
@@ -31,7 +31,7 @@
  * only at 0xC0-0xDF area.
 */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
diff --git a/share/syscons/scrnmaps/iso-8859-7_to_cp437 b/share/syscons/scrnmaps/iso-8859-7_to_cp437
index 12c467a360f2..7c1b49dba2da 100644
--- a/share/syscons/scrnmaps/iso-8859-7_to_cp437
+++ b/share/syscons/scrnmaps/iso-8859-7_to_cp437
@@ -2,7 +2,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/share/syscons/scrnmaps/koi8-r2cp866 b/share/syscons/scrnmaps/koi8-r2cp866
index 15f2847fa9b3..d8d86f28e3e8 100644
--- a/share/syscons/scrnmaps/koi8-r2cp866
+++ b/share/syscons/scrnmaps/koi8-r2cp866
@@ -26,7 +26,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/share/syscons/scrnmaps/koi8-u2cp866u b/share/syscons/scrnmaps/koi8-u2cp866u
index 7fd86ad51bb7..a4e583da44a8 100644
--- a/share/syscons/scrnmaps/koi8-u2cp866u
+++ b/share/syscons/scrnmaps/koi8-u2cp866u
@@ -28,7 +28,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/share/syscons/scrnmaps/us-ascii_to_cp437 b/share/syscons/scrnmaps/us-ascii_to_cp437
index e1155aa137c4..5e7d631237b3 100644
--- a/share/syscons/scrnmaps/us-ascii_to_cp437
+++ b/share/syscons/scrnmaps/us-ascii_to_cp437
@@ -2,7 +2,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101100559.10A5xfr7006691>