MEANS: Improve error messages and coding style.

[pspp] / src / language / stats / means.h

diff --git a/src/language/stats/means.h b/src/language/stats/means.h
index 9d93a4f07a84cc626e61792f14bb5947eb0fa3db..1ce86868e112a610f9535d6d39c376e97b656f9a 100644 (file)
--- a/src/language/stats/means.h
+++ b/src/language/stats/means.h
@@ -17,8 +17,14 @@
 #ifndef MEANS_H
 #define MEANS_H
 
+#include "libpspp/hmap.h"
+#include "libpspp/bt.h"
 #include "libpspp/compiler.h"
 
+struct casereader;
+struct dataset;
+struct lexer;
+
 struct cell_container
 {
   /* A hash table containing the cells.  The table is indexed by a hash
@@ -125,6 +131,7 @@ struct means
   /* The statistics to be calculated for each cell.  */
   int *statistics;
   int n_statistics;
+  size_t allocated_statistics;
 
   /* Pool on which cell functions may allocate data.  */
   struct pool *pool;
@@ -146,18 +153,8 @@ enum
     MEANS_STDDEV
   };
 
-
-
-struct dataset;
-struct casereader;
-void run_means (struct means *cmd, struct casereader *input, const struct dataset *ds UNUSED);
-
-void means_shipout (const struct mtable *mt, const struct means *means);
-
-void means_case_processing_summary (const struct mtable *mt);
-
-
-void destroy_means (struct means *means);
-
+void run_means (struct means *, struct casereader *, const struct dataset *);
+bool means_parse (struct lexer *, struct means *);
+void means_set_default_statistics (struct means *);
 
 #endif