X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasereader.c;h=ee7facb769dbf9a26dc96d717f1249a7fe44879b;hb=b648b71a8e7180c976aa66dfe05afcf152a1e19d;hp=e6d859c9df5c101799f086aa12b58f670b36561d;hpb=c217e77f75f84c5e31ea0f698014069cd4e78e0c;p=pspp-builds.git diff --git a/src/data/casereader.c b/src/data/casereader.c index e6d859c9..ee7facb7 100644 --- 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, - struct casereader_class *class) + const struct casereader_class *class) { return reader->class == class ? reader->aux : NULL; } @@ -393,7 +393,7 @@ struct random_reader_shared 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 @@ random_reader_peek (struct casereader *reader, void *br_, } /* 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 shim 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 @@ -589,7 +589,7 @@ insert_shim (struct casereader *reader) size_t value_cnt = casereader_get_value_cnt (reader); casenumber case_cnt = casereader_get_case_cnt (reader); struct shim *b = xmalloc (sizeof *b); - b->window = casewindow_create (value_cnt, get_workspace_cases (value_cnt)); + b->window = casewindow_create (value_cnt, settings_get_workspace_cases (value_cnt)); b->subreader = casereader_create_random (value_cnt, case_cnt, &shim_class, b); casereader_swap (reader, b->subreader); @@ -646,7 +646,7 @@ shim_advance (struct casereader *reader UNUSED, void *b_, casenumber case_cnt) } /* Class for the buffered reader. */ -static struct casereader_random_class shim_class = +static const struct casereader_random_class shim_class = { shim_read, shim_destroy,