[Pspp-cvs] pspp/src/data casereader-filter.c casereader-pr...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/12/21 23:49:37

Modified files:
        src/data       : casereader-filter.c casereader-provider.h 
                         casereader-translator.c casereader.c 
                         casewriter-translator.c gnumeric-reader.c 
                         lazy-casereader.c por-file-reader.c 
                         por-file-writer.c procedure.c scratch-writer.c 
                         sys-file-reader.c sys-file-writer.c 

Log message:
        Made case_{reader,writer}_class structures const.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-filter.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-provider.h?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader-translator.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casereader.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casewriter-translator.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/gnumeric-reader.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/lazy-casereader.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-reader.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-writer.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.c?cvsroot=pspp&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/scratch-writer.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-writer.c?cvsroot=pspp&r1=1.38&r2=1.39

Patches:
Index: casereader-filter.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/casereader-filter.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- casereader-filter.c 7 Jul 2007 06:14:07 -0000       1.6
+++ casereader-filter.c 21 Dec 2007 23:49:36 -0000      1.7
@@ -43,7 +43,7 @@
     struct casewriter *exclude; /* Writer that gets filtered cases, or NULL. */
   };
 
-static struct casereader_class casereader_filter_class;
+static const struct casereader_class casereader_filter_class;
 
 /* Creates and returns a casereader whose content is a filtered
    version of the data in SUBREADER.  Only the cases for which
@@ -130,7 +130,7 @@
 }
 
 /* Filtering casereader class. */
-static struct casereader_class casereader_filter_class =
+static const struct casereader_class casereader_filter_class =
   {
     casereader_filter_read,
     casereader_filter_destroy,

Index: casereader-provider.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/casereader-provider.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- casereader-provider.h       19 Sep 2007 04:28:59 -0000      1.5
+++ casereader-provider.h       21 Dec 2007 23:49:36 -0000      1.6
@@ -111,7 +111,7 @@
                               size_t value_cnt, casenumber case_cnt,
                               const struct casereader_class *, void *);
 
-void *casereader_dynamic_cast (struct casereader *, struct casereader_class *);
+void *casereader_dynamic_cast (struct casereader *, const struct 
casereader_class *);
 
 /* Casereader class for random-access data sources. */
 struct casereader_random_class

Index: casereader-translator.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/casereader-translator.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- casereader-translator.c     12 Sep 2007 13:43:49 -0000      1.6
+++ casereader-translator.c     21 Dec 2007 23:49:36 -0000      1.7
@@ -38,7 +38,7 @@
     void *aux;
   };
 
-static struct casereader_class casereader_translator_class;
+static const struct casereader_class casereader_translator_class;
 
 /* Creates and returns a new casereader whose cases are produced
    by reading from SUBREADER and passing through TRANSLATE, which
@@ -103,7 +103,7 @@
 }
 
 /* Casereader class for translating casereader. */
-static struct casereader_class casereader_translator_class =
+static const struct casereader_class casereader_translator_class =
   {
     casereader_translator_read,
     casereader_translator_destroy,

Index: casereader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/casereader.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- casereader.c        8 Dec 2007 06:09:03 -0000       1.9
+++ casereader.c        21 Dec 2007 23:49:36 -0000      1.10
@@ -356,7 +356,7 @@
    casereader to be replaced by a shim caseader). */
 void *
 casereader_dynamic_cast (struct casereader *reader,
-                         struct casereader_class *class)
+                         const struct casereader_class *class)
 {
   return reader->class == class ? reader->aux : NULL;
 }
@@ -393,7 +393,7 @@
     void *aux;
   };
 
-static struct casereader_class random_reader_casereader_class;
+static const struct casereader_class random_reader_casereader_class;
 
 /* Creates and returns a new random_reader with the given SHARED
    data and OFFSET.  Inserts the new random reader into the
@@ -541,7 +541,7 @@
 }
 
 /* Casereader class for random reader. */
-static struct casereader_class random_reader_casereader_class =
+static const struct casereader_class random_reader_casereader_class =
   {
     random_reader_read,
     random_reader_destroy,
@@ -580,7 +580,7 @@
     struct casereader *subreader;       /* Subordinate casereader. */
   };
 
-static struct casereader_random_class shim_class;
+static const struct casereader_random_class shim_class;
 
 /* Interposes a buffering shim atop READER. */
 static void
@@ -646,7 +646,7 @@
 }
 
 /* Class for the buffered reader. */
-static struct casereader_random_class shim_class =
+static const struct casereader_random_class shim_class =
   {
     shim_read,
     shim_destroy,

Index: casewriter-translator.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/casewriter-translator.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- casewriter-translator.c     12 Sep 2007 13:43:50 -0000      1.6
+++ casewriter-translator.c     21 Dec 2007 23:49:36 -0000      1.7
@@ -34,7 +34,7 @@
     void *aux;
   };
 
-static struct casewriter_class casewriter_translator_class;
+static const struct casewriter_class casewriter_translator_class;
 
 /* Creates and returns a new casewriter whose cases are passed
    through TRANSLATE, which must create case OUTPUT, with
@@ -101,7 +101,7 @@
   return reader;
 }
 
-static struct casewriter_class casewriter_translator_class =
+static const struct casewriter_class casewriter_translator_class =
   {
     casewriter_translator_write,
     casewriter_translator_destroy,

Index: gnumeric-reader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/gnumeric-reader.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnumeric-reader.c   8 Nov 2007 21:25:39 -0000       1.4
+++ gnumeric-reader.c   21 Dec 2007 23:49:36 -0000      1.5
@@ -63,7 +63,7 @@
 static bool gnm_file_casereader_read (struct casereader *, void *,
                                      struct ccase *);
 
-static struct casereader_class gnm_file_casereader_class =
+static const struct casereader_class gnm_file_casereader_class =
   {
     gnm_file_casereader_read,
     gnm_file_casereader_destroy,

Index: lazy-casereader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/lazy-casereader.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lazy-casereader.c   1 Oct 2007 04:35:06 -0000       1.2
+++ lazy-casereader.c   21 Dec 2007 23:49:36 -0000      1.3
@@ -35,7 +35,7 @@
     void *aux;
   };
 
-static struct casereader_class lazy_casereader_class;
+static const struct casereader_class lazy_casereader_class;
 
 /* Creates and returns a new lazy casereader that will
    instantiate its underlying casereader, if necessary, by
@@ -152,7 +152,7 @@
   return casereader_peek (reader, idx, c);
 }
 
-static struct casereader_class lazy_casereader_class =
+static const struct casereader_class lazy_casereader_class =
   {
     lazy_casereader_read,
     lazy_casereader_do_destroy,

Index: por-file-reader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/por-file-reader.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- por-file-reader.c   11 Nov 2007 05:51:41 -0000      1.28
+++ por-file-reader.c   21 Dec 2007 23:49:36 -0000      1.29
@@ -79,7 +79,7 @@
     bool ok;                    /* Set false on I/O error. */
   };
 
-static struct casereader_class por_file_casereader_class;
+static const struct casereader_class por_file_casereader_class;
 
 static void
 error (struct pfm_reader *r, const char *msg,...)
@@ -894,7 +894,7 @@
   return true;
 }
 
-static struct casereader_class por_file_casereader_class =
+static const struct casereader_class por_file_casereader_class =
   {
     por_file_casereader_read,
     por_file_casereader_destroy,

Index: por-file-writer.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/por-file-writer.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- por-file-writer.c   6 Nov 2007 06:23:26 -0000       1.22
+++ por-file-writer.c   21 Dec 2007 23:49:36 -0000      1.23
@@ -77,7 +77,7 @@
     int fv;                     /* Starting case index. */
   };
 
-static struct casewriter_class por_file_casewriter_class;
+static const struct casewriter_class por_file_casewriter_class;
 
 static bool close_writer (struct pfm_writer *);
 static void buf_write (struct pfm_writer *, const void *, size_t);
@@ -898,7 +898,7 @@
   return;
 }
 
-static struct casewriter_class por_file_casewriter_class =
+static const struct casewriter_class por_file_casewriter_class =
   {
     por_file_casewriter_write,
     por_file_casewriter_destroy,

Index: procedure.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- procedure.c 11 Nov 2007 05:51:41 -0000      1.39
+++ procedure.c 21 Dec 2007 23:49:36 -0000      1.40
@@ -137,7 +137,7 @@
   return proc_commit (ds) && ok;
 }
 
-static struct casereader_class proc_casereader_class;
+static const struct casereader_class proc_casereader_class;
 
 /* Opens dataset DS for reading cases with proc_read.
    proc_commit must be called when done. */
@@ -344,7 +344,7 @@
 }
 
 /* Casereader class for procedure execution. */
-static struct casereader_class proc_casereader_class =
+static const struct casereader_class proc_casereader_class =
   {
     proc_casereader_read,
     proc_casereader_destroy,

Index: scratch-writer.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/scratch-writer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- scratch-writer.c    6 Nov 2007 06:23:26 -0000       1.12
+++ scratch-writer.c    21 Dec 2007 23:49:36 -0000      1.13
@@ -46,7 +46,7 @@
     struct casewriter *subwriter;       /* Data output. */
   };
 
-static struct casewriter_class scratch_writer_casewriter_class;
+static const struct casewriter_class scratch_writer_casewriter_class;
 
 /* Opens FH, which must have referent type FH_REF_SCRATCH, and
    returns a scratch_writer for it, or a null pointer on
@@ -143,7 +143,7 @@
   free (writer);
 }
 
-static struct casewriter_class scratch_writer_casewriter_class =
+static const struct casewriter_class scratch_writer_casewriter_class =
   {
     scratch_writer_casewriter_write,
     scratch_writer_casewriter_destroy,

Index: sys-file-reader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- sys-file-reader.c   7 Dec 2007 05:22:06 -0000       1.53
+++ sys-file-reader.c   21 Dec 2007 23:49:36 -0000      1.54
@@ -88,7 +88,7 @@
     size_t opcode_idx;          /* Next opcode to interpret, 8 if none left. */
   };
 
-static struct casereader_class sys_file_casereader_class;
+static const struct casereader_class sys_file_casereader_class;
 
 static bool close_reader (struct sfm_reader *);
 
@@ -1716,7 +1716,7 @@
     }
 }
 
-static struct casereader_class sys_file_casereader_class =
+static const struct casereader_class sys_file_casereader_class =
   {
     sys_file_casereader_read,
     sys_file_casereader_destroy,

Index: sys-file-writer.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/sys-file-writer.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- sys-file-writer.c   19 Nov 2007 01:06:05 -0000      1.38
+++ sys-file-writer.c   21 Dec 2007 23:49:36 -0000      1.39
@@ -90,7 +90,7 @@
                                    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 *);
@@ -751,7 +751,7 @@
 }
 
 /* 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,