Work on support for variable sets.

[pspp] / src / data / casereader-provider.h

diff --git a/src/data/casereader-provider.h b/src/data/casereader-provider.h
index 31d8a6d4c88e67a6afab5ad2e372c0b5041f6790..37bde24310c76e1a1c5c6facd49c439968c9272c 100644 (file)
--- a/src/data/casereader-provider.h
+++ b/src/data/casereader-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 #ifndef DATA_CASEREADER_PROVIDER_H
 #define DATA_CASEREADER_PROVIDER_H 1
 
-#include <data/casereader.h>
+#include "data/casereader.h"
 
 /* Casereader class for sequential data sources. */
 struct casereader_class
@@ -112,7 +112,7 @@ struct casereader_class
 
 struct casereader *
 casereader_create_sequential (const struct taint *,
-                              size_t value_cnt, casenumber case_cnt,
+                              const struct caseproto *, casenumber n_cases,
                               const struct casereader_class *, void *);
 
 void *casereader_dynamic_cast (struct casereader *, const struct casereader_class *);
@@ -148,19 +148,19 @@ struct casereader_random_class
        function should call casereader_force_error on READER. */
     void (*destroy) (struct casereader *reader, void *aux);
 
-    /* Mandatory.
+    /* Optional.
 
-       A call to this function tells the callee that the CNT
+       A call to this function tells the callee that the N
        cases at the beginning of READER will never be read again.
        The casereader implementation should free any resources
        associated with those cases.  After this function returns,
        the IDX argument in future calls to the "read" function
        will be relative to remaining cases. */
-    void (*advance) (struct casereader *reader, void *aux, casenumber cnt);
+    void (*advance) (struct casereader *reader, void *aux, casenumber n);
   };
 
 struct casereader *
-casereader_create_random (size_t value_cnt, casenumber case_cnt,
+casereader_create_random (const struct caseproto *, casenumber n_cases,
                           const struct casereader_random_class *, void *aux);
 
 #endif /* data/casereader-provider.h */