projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subscript fixes; added free functions
[pspp]
/
src
/
language
/
stats
/
flip.c
diff --git
a/src/language/stats/flip.c
b/src/language/stats/flip.c
index 43d6d0f5b2a7916b5690625a03d322682d14fa17..0e9b56c5c87ecf7962db9cacd7083d9c29c8f2b8 100644
(file)
--- a/
src/language/stats/flip.c
+++ b/
src/language/stats/flip.c
@@
-18,31
+18,36
@@
02110-1301, USA. */
#include "config.h"
02110-1301, USA. */
#include "config.h"
-#include <libpspp/message.h>
+
#include <ctype.h>
#include <errno.h>
#include <float.h>
#include <limits.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <float.h>
#include <limits.h>
#include <stdlib.h>
-#include <libpspp/array.h>
-#include <libpspp/alloc.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include <data/case-sink.h>
+#include <data/case-source.h>
#include <data/case.h>
#include <data/case.h>
-#include <language/command.h>
#include <data/dictionary.h>
#include <data/dictionary.h>
-#include <libpspp/message.h>
-#include "intprops.h"
+#include <data/procedure.h>
+#include <data/settings.h>
+#include <data/value.h>
+#include <data/variable.h>
+#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/array.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
-#include <data/settings.h>
#include <libpspp/str.h>
#include <libpspp/str.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <procedure.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
+#include "intprops.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-87,14
+92,12
@@
int
cmd_flip (void)
{
struct flip_pgm *flip;
cmd_flip (void)
{
struct flip_pgm *flip;
+ struct case_sink *sink;
bool ok;
bool ok;
- if (temporary != 0)
- {
- msg (SM, _("FLIP ignores TEMPORARY. "
- "Temporary transformations will be made permanent."));
- cancel_temporary ();
- }
+ if (proc_make_temporary_transformations_permanent ())
+ msg (SW, _("FLIP ignores TEMPORARY. "
+ "Temporary transformations will be made permanent."));
flip = pool_create_container (struct flip_pgm, pool);
flip->var = NULL;
flip = pool_create_container (struct flip_pgm, pool);
flip->var = NULL;
@@
-146,10
+149,11
@@
cmd_flip (void)
/* Read the active file into a flip_sink. */
flip->case_cnt = 0;
/* Read the active file into a flip_sink. */
flip->case_cnt = 0;
-
temp_trns = temporary = 0
;
-
vfm_
sink = flip_sink_create (flip);
- if (
vfm_
sink == NULL)
+
proc_make_temporary_transformations_permanent ()
;
+ sink = flip_sink_create (flip);
+ if (sink == NULL)
goto error;
goto error;
+ proc_set_sink (sink);
flip->new_names_tail = NULL;
ok = procedure (NULL, NULL);
flip->new_names_tail = NULL;
ok = procedure (NULL, NULL);
@@
-170,7
+174,7
@@
cmd_flip (void)
flip->case_size = dict_get_case_size (default_dict);
/* Set up flipped data for reading. */
flip->case_size = dict_get_case_size (default_dict);
/* Set up flipped data for reading. */
-
vfm_source = flip_source_create (flip
);
+
proc_set_source (flip_source_create (flip)
);
return ok ? lex_end_of_command () : CMD_CASCADING_FAILURE;
return ok ? lex_end_of_command () : CMD_CASCADING_FAILURE;
@@
-331,12
+335,8
@@
flip_sink_write (struct case_sink *sink, const struct ccase *c)
strcpy (v->name, "VNEGINF");
else if (f > INT_MAX)
strcpy (v->name, "VPOSINF");
strcpy (v->name, "VNEGINF");
else if (f > INT_MAX)
strcpy (v->name, "VPOSINF");
- else
- {
- char name[INT_STRLEN_BOUND (int) + 2];
- sprintf (name, "V%d", (int) f);
- str_copy_trunc (v->name, sizeof v->name, name);
- }
+ else
+ snprintf (v->name, sizeof v->name, "V%d", (int) f);
}
else
{
}
else
{
@@
-475,7
+475,11
@@
flip_file (struct flip_pgm *flip)
case_idx += read_cases;
}
case_idx += read_cases;
}
- pool_fclose (flip->pool, input_file);
+ if (pool_fclose (flip->pool, input_file) == EOF)
+ {
+ msg (SE, _("Error closing FLIP source file: %s."), strerror (errno));
+ return false;
+ }
pool_unregister (flip->pool, input_buf);
free (input_buf);
pool_unregister (flip->pool, input_buf);
free (input_buf);