Clean up file handle code in preparation to add temporary file

[pspp] / src / flip.c

diff --git a/src/flip.c b/src/flip.c
index 8d70317011362c5be0d21a880877b6f03abfceb6..204982357b043ddb45eddec19502b43c9bbf79f0 100644 (file)
--- a/src/flip.c
+++ b/src/flip.c
@@ -285,7 +285,7 @@ flip_sink_create (struct flip_pgm *flip)
   size_t i;
 
   info->flip = flip;
-  info->output_buf = xmalloc (sizeof *info->output_buf * flip->var_cnt);
+  info->output_buf = xnmalloc (flip->var_cnt, sizeof *info->output_buf);
 
   flip->file = tmpfile ();
   if (!flip->file)
@@ -316,7 +316,7 @@ flip_sink_write (struct case_sink *sink, const struct ccase *c)
 
   if (flip->new_names != NULL)
     {
-      struct varname *v = xmalloc (sizeof (struct varname));
+      struct varname *v = xmalloc (sizeof *v);
       v->next = NULL;
       if (flip->new_names->type == NUMERIC) 
         {
@@ -379,7 +379,7 @@ flip_file (struct flip_pgm *flip)
 
   /* Allocate memory for many cases. */
   case_bytes = flip->var_cnt * sizeof *input_buf;
-  case_capacity = get_max_workspace() / case_bytes;
+  case_capacity = get_workspace () / case_bytes;
   if (case_capacity > flip->case_cnt * 2)
     case_capacity = flip->case_cnt * 2;
   if (case_capacity < 2)
@@ -499,7 +499,7 @@ flip_source_read (struct case_source *source,
   union value *input_buf;
   size_t i;
 
-  input_buf = xmalloc (sizeof *input_buf * flip->case_cnt);
+  input_buf = xnmalloc (flip->case_cnt, sizeof *input_buf);
   for (i = 0; i < flip->var_cnt; i++)
     {
       size_t j;