Continue reforming procedure execution. In this phase, get rid of the

[pspp-builds.git] / src / data / procedure.h

diff --git a/src/data/procedure.h b/src/data/procedure.h
index 5a1968782cb9fa462aaf29351cbd7ed8a0a48e61..76ca6dc88fc3ea9a2125b28c4251765b41bd4a53 100644 (file)
--- a/src/data/procedure.h
+++ b/src/data/procedure.h
@@ -62,15 +62,16 @@ bool proc_has_source (void);
 void proc_set_sink (struct case_sink *);
 struct casefile *proc_capture_output (void);
 
-bool procedure (bool (*proc_func) (struct ccase *, void *aux), void *aux);
-bool procedure_with_splits (void (*begin_func) (void *aux),
-                            bool (*proc_func) (struct ccase *, void *aux),
-                            void (*end_func) (void *aux),
+bool procedure (bool (*proc_func) (struct ccase *, void *),
+                void *aux);
+bool procedure_with_splits (void (*begin_func) (const struct ccase *, void *),
+                            bool (*proc_func) (const struct ccase *, void *),
+                            void (*end_func) (void *),
                             void *aux);
-bool multipass_procedure (bool (*proc_func) (const struct casefile *,
-                                             void *aux),
+bool multipass_procedure (bool (*proc_func) (const struct casefile *, void *),
                           void *aux);
-bool multipass_procedure_with_splits (bool (*) (const struct casefile *,
+bool multipass_procedure_with_splits (bool (*) (const struct ccase *,
+                                                const struct casefile *,
                                                 void *),
                                       void *aux);
 time_t time_of_last_procedure (void);