projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't append -ansi to AM_CFLAGS for GCC. Using -ansi changes the
[pspp]
/
src
/
modify-vars.c
diff --git
a/src/modify-vars.c
b/src/modify-vars.c
index bce6ea1bb337daef2736bba4de9c761f0ed4bbeb..fee6d59b840f92afdff88c1a877dc0a15cfc0a6e 100644
(file)
--- a/
src/modify-vars.c
+++ b/
src/modify-vars.c
@@
-14,16
+14,17
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include <stdlib.h>
#include <config.h>
#include <stdlib.h>
-#include
<assert.h>
+#include
"error.h"
#include "algorithm.h"
#include "alloc.h"
#include "bitvector.h"
#include "command.h"
#include "algorithm.h"
#include "alloc.h"
#include "bitvector.h"
#include "command.h"
+#include "dictionary.h"
#include "error.h"
#include "hash.h"
#include "lexer.h"
#include "error.h"
#include "hash.h"
#include "lexer.h"
@@
-83,8
+84,12
@@
cmd_modify_vars (void)
size_t i;
size_t i;
- lex_match_id ("MODIFY");
- lex_match_id ("VARS");
+ if (temporary != 0)
+ {
+ msg (SE, _("MODIFY VARS may not be used after TEMPORARY. "
+ "Temporary transformations will be made permanent."));
+ cancel_temporary ();
+ }
vm.reorder_vars = NULL;
vm.reorder_cnt = 0;
vm.reorder_vars = NULL;
vm.reorder_cnt = 0;
@@
-309,7
+314,7
@@
cmd_modify_vars (void)
if (already_encountered & (1 | 4))
{
/* Read the data. */
if (already_encountered & (1 | 4))
{
/* Read the data. */
- procedure (NULL, NULL
, NULL
);
+ procedure (NULL, NULL);
}
if (!rearrange_dict (default_dict, &vm))
}
if (!rearrange_dict (default_dict, &vm))
@@
-343,7
+348,7
@@
compare_variables_given_ordering (const void *a_, const void *b_,
if (ordering->positional)
result = a->index < b->index ? -1 : a->index > b->index;
else
if (ordering->positional)
result = a->index < b->index ? -1 : a->index > b->index;
else
- result = strcmp (a->name, b->name);
+ result = strc
asec
mp (a->name, b->name);
if (!ordering->forward)
result = -result;
return result;
if (!ordering->forward)
result = -result;
return result;
@@
-353,7
+358,7
@@
compare_variables_given_ordering (const void *a_, const void *b_,
struct var_renaming
{
struct variable *var;
struct var_renaming
{
struct variable *var;
- char new_name[
9
];
+ char new_name[
LONG_NAME_LEN + 1
];
};
/* A algo_compare_func that compares new_name members in struct
};
/* A algo_compare_func that compares new_name members in struct
@@
-365,7
+370,7
@@
compare_var_renaming_by_new_name (const void *a_, const void *b_,
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
- return strcmp (a->new_name, b->new_name);
+ return strc
asec
mp (a->new_name, b->new_name);
}
/* Returns true if performing VM on dictionary D would not cause
}
/* Returns true if performing VM on dictionary D would not cause