X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fdelete-variables.c;h=97c54a81b6e13ac1052011b6673dbb52f75cd16b;hb=b5cebf00d5edaada965b3dc75c745942d9483059;hp=a0a1fb244f6e6508cb8823fb9e298593ee8ebb8d;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp-builds.git diff --git a/src/language/dictionary/delete-variables.c b/src/language/dictionary/delete-variables.c index a0a1fb24..97c54a81 100644 --- a/src/language/dictionary/delete-variables.c +++ b/src/language/dictionary/delete-variables.c @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. - Copyright (C) 2006, 2007 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 2006, 2007, 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include @@ -43,8 +40,7 @@ cmd_delete_variables (struct lexer *lexer, struct dataset *ds) msg (SE, _("DELETE VARIABLES may not be used after TEMPORARY. " "Temporary transformations will be made permanent.")); - if (!parse_variables (lexer, dataset_dict (ds), &vars, &var_cnt, - PV_NONE)) + if (!parse_variables (lexer, dataset_dict (ds), &vars, &var_cnt, PV_NONE)) goto error; if (var_cnt == dict_get_var_cnt (dataset_dict (ds))) { @@ -52,15 +48,15 @@ cmd_delete_variables (struct lexer *lexer, struct dataset *ds) "from the active file dictionary. Use NEW FILE instead.")); goto error; } - + ok = casereader_destroy (proc_open (ds)); ok = proc_commit (ds) && ok; if (!ok) goto error; dict_delete_vars (dataset_dict (ds), vars, var_cnt); - + free (vars); - + return CMD_SUCCESS; error: