projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FLIP: Don't change new variables to upper case.
[pspp]
/
src
/
language
/
stats
/
flip.c
diff --git
a/src/language/stats/flip.c
b/src/language/stats/flip.c
index c8cb03b92d7f75aff63dc5fe3ca549d8a4d2b365..a0e1e284174550e807f269c088953f677636d041 100644
(file)
--- a/
src/language/stats/flip.c
+++ b/
src/language/stats/flip.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009
, 2010
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
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
@@
-144,7
+144,7
@@
cmd_flip (struct lexer *lexer, struct dataset *ds)
}
}
}
}
- flip->file = pool_
tmp
file (flip->pool);
+ flip->file = pool_
create_temp_
file (flip->pool);
if (flip->file == NULL)
{
msg (SE, _("Could not create temporary file for FLIP."));
if (flip->file == NULL)
{
msg (SE, _("Could not create temporary file for FLIP."));
@@
-186,7
+186,6
@@
cmd_flip (struct lexer *lexer, struct dataset *ds)
{
name = data_out_pool (value, dict_get_encoding (flip->dict), var_get_write_format (flip->new_names_var),
flip->pool);
{
name = data_out_pool (value, dict_get_encoding (flip->dict), var_get_write_format (flip->new_names_var),
flip->pool);
-
}
var_names_add (flip->pool, &flip->new_names, name);
}
}
var_names_add (flip->pool, &flip->new_names, name);
}
@@
-261,7
+260,6
@@
make_new_var (struct dictionary *dict, const char *name_)
*cp = '_';
}
*cp = '\0';
*cp = '_';
}
*cp = '\0';
- str_uppercase (name);
/* Use the mangled name, if it is available, or add numeric
extensions until we find one that is. */
/* Use the mangled name, if it is available, or add numeric
extensions until we find one that is. */
@@
-322,13
+320,13
@@
flip_file (struct flip_pgm *flip)
output_buf = input_buf + flip->n_vars * case_capacity;
input_file = flip->file;
output_buf = input_buf + flip->n_vars * case_capacity;
input_file = flip->file;
- if (fseek (input_file, 0, SEEK_SET) != 0)
+ if (fseek
o
(input_file, 0, SEEK_SET) != 0)
{
msg (SE, _("Error rewinding FLIP file: %s."), strerror (errno));
return false;
}
{
msg (SE, _("Error rewinding FLIP file: %s."), strerror (errno));
return false;
}
- output_file = pool_
tmp
file (flip->pool);
+ output_file = pool_
create_temp_
file (flip->pool);
if (output_file == NULL)
{
msg (SE, _("Error creating FLIP source file."));
if (output_file == NULL)
{
msg (SE, _("Error creating FLIP source file."));
@@
-379,15
+377,11
@@
flip_file (struct flip_pgm *flip)
case_idx += read_cases;
}
case_idx += read_cases;
}
- if (pool_fclose (flip->pool, input_file) == EOF)
- {
- msg (SE, _("Error closing FLIP source file: %s."), strerror (errno));
- return false;
- }
+ pool_fclose_temp_file (flip->pool, input_file);
pool_unregister (flip->pool, input_buf);
free (input_buf);
pool_unregister (flip->pool, input_buf);
free (input_buf);
- if (fseek (output_file, 0, SEEK_SET) != 0)
+ if (fseek
o
(output_file, 0, SEEK_SET) != 0)
{
msg (SE, _("Error rewinding FLIP source file: %s."), strerror (errno));
return false;
{
msg (SE, _("Error rewinding FLIP source file: %s."), strerror (errno));
return false;