CORRELATIONS: Improve error messages and coding style.

[pspp] / src / language / stats / examine.c

diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c
index 4dbafce320ba41d0e1d892034b310ccd22626bb7..6ad5e67e4ba83b75c143cca5b209fb20a9ae1eb5 100644 (file)
--- a/src/language/stats/examine.c
+++ b/src/language/stats/examine.c
@@ -1033,7 +1033,7 @@ create_n (const void *aux1, void *aux2 UNUSED)
       es[v].minimum =  DBL_MAX;
     }
 
-  subcase_destroy (&ordering);
+  subcase_uninit (&ordering);
   return es;
 }
 
@@ -1515,7 +1515,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds)
       while (iact);
     }
 
-
+  int nototals_ofs = 0;
   while (lex_token (lexer) != T_ENDCMD)
     {
       lex_match (lexer, T_SLASH);
@@ -1630,6 +1630,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds)
       else if (lex_match_id (lexer, "NOTOTAL"))
         {
           nototals_seen = true;
+          nototals_ofs = lex_ofs (lexer) - 1;
         }
       else if (lex_match_id (lexer, "MISSING"))
         {
@@ -1758,7 +1759,9 @@ cmd_examine (struct lexer *lexer, struct dataset *ds)
 
   if (totals_seen && nototals_seen)
     {
-      msg (SE, _("%s and %s are mutually exclusive"), "TOTAL", "NOTOTAL");
+      lex_ofs_error (lexer, nototals_ofs, nototals_ofs,
+                     _("%s and %s are mutually exclusive."),
+                     "TOTAL", "NOTOTAL");
       goto error;
     }