Reworked settings so as to use one large struct instead of lots of static

[pspp-builds.git] / src / data / sys-file-writer.c

diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
index fd663d69b5bc7532d98412eeebf865dcd41d61fa..7804e5914f72d7ac49f06a1f8ccb1bd71aec48ce 100644 (file)
--- a/src/data/sys-file-writer.c
+++ b/src/data/sys-file-writer.c
@@ -90,7 +90,7 @@ struct sfm_writer
                                    for long string variables. */
   };
 
-static struct casewriter_class sys_file_casewriter_class;
+static const struct casewriter_class sys_file_casewriter_class;
 
 static void write_header (struct sfm_writer *, const struct dictionary *);
 static void write_variable (struct sfm_writer *, const struct variable *);
@@ -136,7 +136,7 @@ sfm_writer_default_options (void)
 {
   struct sfm_write_options opts;
   opts.create_writeable = true;
-  opts.compress = get_scompression ();
+  opts.compress = settings_get_scompression ();
   opts.version = 3;
   return opts;
 }
@@ -333,7 +333,7 @@ write_header (struct sfm_writer *w, const struct dictionary *d)
     }
   else
     {
-      static const char *month_name[12] =
+      static const char *const month_name[12] =
         {
           "Jan", "Feb", "Mar", "Apr", "May", "Jun",
           "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
@@ -751,7 +751,7 @@ close_writer (struct sfm_writer *w)
 }
 
 /* System file writer casewriter class. */
-static struct casewriter_class sys_file_casewriter_class =
+static const struct casewriter_class sys_file_casewriter_class =
   {
     sys_file_casewriter_write,
     sys_file_casewriter_destroy,