Eliminated global variable current_dataset.

[pspp-builds.git] / src / language / tests / moments-test.c

diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c
index 4b685231454eaa2a17de5d9d9dab861c6dcdd84e..533b558ff003409d43bd0557f6cf852ec7aef8c1 100644 (file)
--- a/src/language/tests/moments-test.c
+++ b/src/language/tests/moments-test.c
@@ -23,10 +23,14 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <math/moments.h>
+#include <math.h>
+#include <stdlib.h>
+#include "xalloc.h"
+#include <libpspp/compiler.h>
 
 #define _(msgid) gettext (msgid)
 
-static int
+static bool
 read_values (double **values, double **weights, size_t *cnt) 
 {
   size_t cap = 0;
@@ -44,7 +48,7 @@ read_values (double **values, double **weights, size_t *cnt)
           if (!lex_is_number ())
             {
               lex_error (_("expecting weight value"));
-              return 0;
+              return false;
             }
           weight = tokval;
           lex_get ();
@@ -62,11 +66,11 @@ read_values (double **values, double **weights, size_t *cnt)
       (*cnt)++;
     }
 
-  return 1;
+  return true;
 }
 
 int
-cmd_debug_moments (void) 
+cmd_debug_moments (struct dataset *ds UNUSED) 
 {
   int retval = CMD_FAILURE;
   double *values = NULL;