Clean up how transformations work.

[pspp] / src / language / xforms / fail.c

diff --git a/src/language/xforms/fail.c b/src/language/xforms/fail.c
index 3ca945243e767199d70190332dc64863ee8c6392..f90b19673ebc6d8bf2d9d820dd9498e1678f839f 100644 (file)
--- a/src/language/xforms/fail.c
+++ b/src/language/xforms/fail.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,17 +19,15 @@
 #include <stdlib.h>
 
 #include "data/case.h"
-#include "data/procedure.h"
+#include "data/dataset.h"
 #include "data/transformations.h"
 #include "language/command.h"
 #include "language/lexer/lexer.h"
 #include "libpspp/message.h"
-
-static int trns_fail (void *x, struct ccase **c, casenumber n);
 \f
 /* A transformation which is guaranteed to fail. */
 
-static int
+static enum trns_result
 trns_fail (void *x UNUSED, struct ccase **c UNUSED,
           casenumber n UNUSED)
 {
@@ -38,10 +36,12 @@ trns_fail (void *x UNUSED, struct ccase **c UNUSED,
 }
 
 int
-cmd_debug_xform_fail (struct lexer *lexer, struct dataset *ds)
+cmd_debug_xform_fail (struct lexer *lexer UNUSED, struct dataset *ds)
 {
-
-  add_transformation (ds, trns_fail, NULL, NULL);
-
-  return lex_end_of_command (lexer);
+  static const struct trns_class fail_trns_class = {
+    .name = "DEBUG XFORM FAIL",
+    .execute = trns_fail
+  };
+  add_transformation (ds, &fail_trns_class, NULL);
+  return CMD_SUCCESS;
 }