From 0bfcecb94112d3e4e310e541ce9641b765709fb0 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 12 Sep 2020 07:31:58 +0200
Subject: [PATCH] Add static qualifiers where appropriate.

A number of items were defined in global scope.  This change
puts them into file scope.
---
 src/libpspp/temp-file.c            | 2 +-
 src/ui/gui/main.c                  | 4 ++--
 src/ui/gui/psppire-output-view.c   | 2 +-
 src/ui/gui/psppire-output-window.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libpspp/temp-file.c b/src/libpspp/temp-file.c
index 03e6f18e61..cc90a37559 100644
--- a/src/libpspp/temp-file.c
+++ b/src/libpspp/temp-file.c
@@ -43,7 +43,7 @@
 static void cleanup (void);
 
 static struct temp_dir *temp_dir;
-struct hmapx map;
+static struct hmapx map;
 
 static void
 setup (void)
diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index 894a2147fc..a7e09af806 100644
--- a/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@ -95,8 +95,8 @@ init_dispatch (GSource * ss, GSourceFunc callback, gpointer user_data)
 static GSourceFuncs init_funcs =
   { init_prepare, init_check, init_dispatch, NULL, NULL, NULL };
 
-GtkWidget *wsplash = 0;
-gint64 start_time = 0;
+static GtkWidget *wsplash = 0;
+static gint64 start_time = 0;
 
 
 static GtkWidget *
diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c
index 7e8b5b3560..4296409120 100644
--- a/src/ui/gui/psppire-output-view.c
+++ b/src/ui/gui/psppire-output-view.c
@@ -801,7 +801,7 @@ CT ( ctn8, "image/svg+xml", 0, SELECT_FMT_SVG )
 #define CT(ID, TARGET, FLAGS, INFO) static gchar ID[] = TARGET;
 CBTARGETS
 #undef CT
-gchar ctnlast[] = "application/vnd.oasis.opendocument.text";
+static gchar ctnlast[] = "application/vnd.oasis.opendocument.text";
 
 static const GtkTargetEntry targets[] = {
 #define CT(ID, TARGET, FLAGS, INFO) { ID, FLAGS, INFO },
diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 458769d583..5d13ecd1ed 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -237,7 +237,7 @@ enum
 
 #define N_EXTENSIONS (n_FT - 1)
 
-struct file_types ft[n_FT] = {
+static const struct file_types ft[n_FT] = {
   {N_("Infer file type from extension"),  NULL},
   {N_("SPSS Viewer (*.spv)"),             ".spv"},
   {N_("PDF (*.pdf)"),                     ".pdf"},
-- 
2.30.2