projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91dc088
)
Made case_{reader,writer}_class structures const.
author
John Darrington
<john@darrington.wattle.id.au>
Fri, 21 Dec 2007 23:49:36 +0000
(23:49 +0000)
committer
John Darrington
<john@darrington.wattle.id.au>
Fri, 21 Dec 2007 23:49:36 +0000
(23:49 +0000)
13 files changed:
src/data/casereader-filter.c
patch
|
blob
|
history
src/data/casereader-provider.h
patch
|
blob
|
history
src/data/casereader-translator.c
patch
|
blob
|
history
src/data/casereader.c
patch
|
blob
|
history
src/data/casewriter-translator.c
patch
|
blob
|
history
src/data/gnumeric-reader.c
patch
|
blob
|
history
src/data/lazy-casereader.c
patch
|
blob
|
history
src/data/por-file-reader.c
patch
|
blob
|
history
src/data/por-file-writer.c
patch
|
blob
|
history
src/data/procedure.c
patch
|
blob
|
history
src/data/scratch-writer.c
patch
|
blob
|
history
src/data/sys-file-reader.c
patch
|
blob
|
history
src/data/sys-file-writer.c
patch
|
blob
|
history
diff --git
a/src/data/casereader-filter.c
b/src/data/casereader-filter.c
index 969bb4fae82f8088d35d88c790ec8d88448b1bea..37e1dc85c828f1908fef2454f3ecad872b9a6d68 100644
(file)
--- a/
src/data/casereader-filter.c
+++ b/
src/data/casereader-filter.c
@@
-43,7
+43,7
@@
struct casereader_filter
struct casewriter *exclude; /* Writer that gets filtered cases, or NULL. */
};
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
/* 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
@@
casereader_filter_destroy (struct casereader *reader, void *filter_)
}
/* Filtering casereader class. */
}
/* Filtering casereader class. */
-static struct casereader_class casereader_filter_class =
+static
const
struct casereader_class casereader_filter_class =
{
casereader_filter_read,
casereader_filter_destroy,
{
casereader_filter_read,
casereader_filter_destroy,
diff --git
a/src/data/casereader-provider.h
b/src/data/casereader-provider.h
index 43c980a8347e33da91d39555abd94f93bf2db70a..772209810a85e44c2f7474a44fcb25235735cf98 100644
(file)
--- a/
src/data/casereader-provider.h
+++ b/
src/data/casereader-provider.h
@@
-111,7
+111,7
@@
casereader_create_sequential (const struct taint *,
size_t value_cnt, casenumber case_cnt,
const struct casereader_class *, void *);
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 *);
\f
/* Casereader class for random-access data sources. */
struct casereader_random_class
\f
/* Casereader class for random-access data sources. */
struct casereader_random_class
diff --git
a/src/data/casereader-translator.c
b/src/data/casereader-translator.c
index 5a717da8252a15de221728734e39e0d6f4210aab..b857b5b880e2d4b9cd71c1a5c49e008cf93a5e9f 100644
(file)
--- a/
src/data/casereader-translator.c
+++ b/
src/data/casereader-translator.c
@@
-38,7
+38,7
@@
struct casereader_translator
void *aux;
};
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
/* Creates and returns a new casereader whose cases are produced
by reading from SUBREADER and passing through TRANSLATE, which
@@
-103,7
+103,7
@@
casereader_translator_destroy (struct casereader *reader UNUSED, void *ct_)
}
/* Casereader class for translating casereader. */
}
/* 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,
{
casereader_translator_read,
casereader_translator_destroy,
diff --git
a/src/data/casereader.c
b/src/data/casereader.c
index e6d859c9df5c101799f086aa12b58f670b36561d..092f770863696b3aa73a73d801c79d586eed9cda 100644
(file)
--- a/
src/data/casereader.c
+++ b/
src/data/casereader.c
@@
-356,7
+356,7
@@
casereader_create_sequential (const struct taint *taint,
casereader to be replaced by a shim caseader). */
void *
casereader_dynamic_cast (struct casereader *reader,
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;
}
{
return reader->class == class ? reader->aux : NULL;
}
@@
-393,7
+393,7
@@
struct random_reader_shared
void *aux;
};
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
/* 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
@@
random_reader_peek (struct casereader *reader, void *br_,
}
/* Casereader class for random reader. */
}
/* 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,
{
random_reader_read,
random_reader_destroy,
@@
-580,7
+580,7
@@
struct shim
struct casereader *subreader; /* Subordinate casereader. */
};
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
/* Interposes a buffering shim atop READER. */
static void
@@
-646,7
+646,7
@@
shim_advance (struct casereader *reader UNUSED, void *b_, casenumber case_cnt)
}
/* Class for the buffered reader. */
}
/* Class for the buffered reader. */
-static struct casereader_random_class shim_class =
+static
const
struct casereader_random_class shim_class =
{
shim_read,
shim_destroy,
{
shim_read,
shim_destroy,
diff --git
a/src/data/casewriter-translator.c
b/src/data/casewriter-translator.c
index 79694a4609469f6deee93f9eccfab44212ef7ef6..c630b44cda397dfffccd980c9d3ecb65255e91dc 100644
(file)
--- a/
src/data/casewriter-translator.c
+++ b/
src/data/casewriter-translator.c
@@
-34,7
+34,7
@@
struct casewriter_translator
void *aux;
};
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
/* Creates and returns a new casewriter whose cases are passed
through TRANSLATE, which must create case OUTPUT, with
@@
-101,7
+101,7
@@
casewriter_translator_convert_to_reader (struct casewriter *writer UNUSED,
return reader;
}
return reader;
}
-static struct casewriter_class casewriter_translator_class =
+static
const
struct casewriter_class casewriter_translator_class =
{
casewriter_translator_write,
casewriter_translator_destroy,
{
casewriter_translator_write,
casewriter_translator_destroy,
diff --git
a/src/data/gnumeric-reader.c
b/src/data/gnumeric-reader.c
index cc8d335b3cff0dcf9bb8c571d0a1f3e8eb8e508c..418d63c2d05dc85f2cd993687e6b036dc7eee26c 100644
(file)
--- a/
src/data/gnumeric-reader.c
+++ b/
src/data/gnumeric-reader.c
@@
-63,7
+63,7
@@
static void gnm_file_casereader_destroy (struct casereader *, void *);
static bool gnm_file_casereader_read (struct casereader *, void *,
struct ccase *);
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,
{
gnm_file_casereader_read,
gnm_file_casereader_destroy,
diff --git
a/src/data/lazy-casereader.c
b/src/data/lazy-casereader.c
index 8c604bce9e70b63ab56a6e1666c800a2f95173e3..2cb8911fe29770559eee3c7c2ea702e88a38b9f5 100644
(file)
--- a/
src/data/lazy-casereader.c
+++ b/
src/data/lazy-casereader.c
@@
-35,7
+35,7
@@
struct lazy_casereader
void *aux;
};
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
/* Creates and returns a new lazy casereader that will
instantiate its underlying casereader, if necessary, by
@@
-152,7
+152,7
@@
lazy_casereader_peek (struct casereader *reader, void *lc_,
return casereader_peek (reader, idx, c);
}
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,
{
lazy_casereader_read,
lazy_casereader_do_destroy,
diff --git
a/src/data/por-file-reader.c
b/src/data/por-file-reader.c
index b5486a4a0e3dcfa1ee795869b46a2922fe03b725..3f2cdd46ec20b914b0a1c9268761e5a962985dc9 100644
(file)
--- a/
src/data/por-file-reader.c
+++ b/
src/data/por-file-reader.c
@@
-79,7
+79,7
@@
struct pfm_reader
bool ok; /* Set false on I/O error. */
};
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,...)
static void
error (struct pfm_reader *r, const char *msg,...)
@@
-894,7
+894,7
@@
pfm_detect (FILE *file)
return true;
}
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,
{
por_file_casereader_read,
por_file_casereader_destroy,
diff --git
a/src/data/por-file-writer.c
b/src/data/por-file-writer.c
index fad89bf7682cbf77a0b7f6a8b270a4ee64c98ede..1f348f67986f3e613d7633b1107406dff2640dce 100644
(file)
--- a/
src/data/por-file-writer.c
+++ b/
src/data/por-file-writer.c
@@
-77,7
+77,7
@@
struct pfm_var
int fv; /* Starting case index. */
};
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);
static bool close_writer (struct pfm_writer *);
static void buf_write (struct pfm_writer *, const void *, size_t);
@@
-898,7
+898,7
@@
format_trig_double (long double value, int base_10_precision, char output[])
return;
}
\f
return;
}
\f
-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,
{
por_file_casewriter_write,
por_file_casewriter_destroy,
diff --git
a/src/data/procedure.c
b/src/data/procedure.c
index 278077e7db93bf3e8786308c85adcac9fe55f78a..98414a2b0478dbb5e44f306e0f99d90684b86003 100644
(file)
--- a/
src/data/procedure.c
+++ b/
src/data/procedure.c
@@
-137,7
+137,7
@@
proc_execute (struct dataset *ds)
return proc_commit (ds) && ok;
}
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. */
/* Opens dataset DS for reading cases with proc_read.
proc_commit must be called when done. */
@@
-344,7
+344,7
@@
proc_commit (struct dataset *ds)
}
/* Casereader class for procedure execution. */
}
/* 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,
{
proc_casereader_read,
proc_casereader_destroy,
diff --git
a/src/data/scratch-writer.c
b/src/data/scratch-writer.c
index e4d977fbfcfbef9d90588c0e43cac23041f8b386..ed88af6db4ee1a211443702de9545c251546abc7 100644
(file)
--- a/
src/data/scratch-writer.c
+++ b/
src/data/scratch-writer.c
@@
-46,7
+46,7
@@
struct scratch_writer
struct casewriter *subwriter; /* Data output. */
};
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
/* 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
@@
scratch_writer_casewriter_destroy (struct casewriter *w UNUSED, void *writer_)
free (writer);
}
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,
{
scratch_writer_casewriter_write,
scratch_writer_casewriter_destroy,
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index 1882943003572ef8b9b28a1d2c73a7a94bd7a776..8b29e0a52aad9dbb7ed5c2b62795f9e2c4876cc8 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-88,7
+88,7
@@
struct sfm_reader
size_t opcode_idx; /* Next opcode to interpret, 8 if none left. */
};
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 *);
static bool close_reader (struct sfm_reader *);
@@
-1716,7
+1716,7
@@
skip_bytes (struct sfm_reader *r, size_t bytes)
}
}
\f
}
}
\f
-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,
{
sys_file_casereader_read,
sys_file_casereader_destroy,
diff --git
a/src/data/sys-file-writer.c
b/src/data/sys-file-writer.c
index fd663d69b5bc7532d98412eeebf865dcd41d61fa..c5392666ff9d441d33b139c688d1a77b638e42b8 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. */
};
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 *);
static void write_header (struct sfm_writer *, const struct dictionary *);
static void write_variable (struct sfm_writer *, const struct variable *);
@@
-751,7
+751,7
@@
close_writer (struct sfm_writer *w)
}
/* System file writer casewriter class. */
}
/* 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,
{
sys_file_casewriter_write,
sys_file_casewriter_destroy,