CORRELATIONS: Improve error messages and coding style.

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

diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c
index 7496b0f0dd7dee0ba80b37c7a4e502b6edda7648..5c5619105222a866a72f83ad5ac0e42eeedcab28 100644 (file)
--- a/src/language/stats/graph.c
+++ b/src/language/stats/graph.c
@@ -840,7 +840,7 @@ cmd_graph (struct lexer *lexer, struct dataset *ds)
              const struct variable *v = NULL;
              if (!lex_match_variable (lexer,graph.dict,&v))
                {
-                 lex_error (lexer, _("Variable expected"));
+                 lex_error (lexer, _("Syntax error expecting variable name."));
                  goto error;
                }
              graph.by_var[0] = v;
@@ -880,7 +880,6 @@ cmd_graph (struct lexer *lexer, struct dataset *ds)
       else if (lex_match_id (lexer, "FOOTNOTE"))
        {
          lex_error (lexer, _("%s is not yet implemented."),"FOOTNOTE");
-         lex_error (lexer, _("FOOTNOTE is not implemented yet for GRAPH"));
          goto error;
        }
       else if (lex_match_id (lexer, "MISSING"))
@@ -977,7 +976,7 @@ cmd_graph (struct lexer *lexer, struct dataset *ds)
     ok = proc_commit (ds) && ok;
   }
 
-  subcase_destroy (&graph.ordering);
+  subcase_uninit (&graph.ordering);
   free (graph.dep_vars);
   pool_destroy (graph.pool);
   caseproto_unref (graph.gr_proto);
@@ -985,7 +984,7 @@ cmd_graph (struct lexer *lexer, struct dataset *ds)
   return CMD_SUCCESS;
 
  error:
-  subcase_destroy (&graph.ordering);
+  subcase_uninit (&graph.ordering);
   caseproto_unref (graph.gr_proto);
   free (graph.dep_vars);
   pool_destroy (graph.pool);