/[pspp]/pspp/src/casefile.c
ViewVC logotype

Diff of /pspp/src/casefile.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.18 by blp, Sun Jul 31 21:42:46 2005 UTC revision 1.19 by blp, Wed Oct 26 05:06:14 2005 UTC
# Line 344  casefile_append (struct casefile *cf, co Line 344  casefile_append (struct casefile *cf, co
344                if ((block_idx & (block_idx - 1)) == 0)                if ((block_idx & (block_idx - 1)) == 0)
345                  {                  {
346                    size_t block_cap = block_idx == 0 ? 1 : block_idx * 2;                    size_t block_cap = block_idx == 0 ? 1 : block_idx * 2;
347                    cf->cases = xrealloc (cf->cases,                    cf->cases = xnrealloc (cf->cases,
348                                          sizeof *cf->cases * block_cap);                                           block_cap, sizeof *cf->cases);
349                  }                  }
350    
351                cf->cases[block_idx] = xmalloc (sizeof **cf->cases                cf->cases[block_idx] = xnmalloc (CASES_PER_BLOCK,
352                                                * CASES_PER_BLOCK);                                                 sizeof **cf->cases);
353              }              }
354    
355            case_move (&cf->cases[block_idx][case_idx], &new_case);            case_move (&cf->cases[block_idx][case_idx], &new_case);
# Line 424  casefile_to_disk (const struct casefile Line 424  casefile_to_disk (const struct casefile
424        cf->storage = DISK;        cf->storage = DISK;
425        if (!make_temp_file (&cf->fd, &cf->filename))        if (!make_temp_file (&cf->fd, &cf->filename))
426          err_failure ();          err_failure ();
427        cf->buffer = xmalloc (cf->buffer_size * sizeof *cf->buffer);        cf->buffer = xnmalloc (cf->buffer_size, sizeof *cf->buffer);
428        memset (cf->buffer, 0, cf->buffer_size * sizeof *cf->buffer);        memset (cf->buffer, 0, cf->buffer_size * sizeof *cf->buffer);
429    
430        case_bytes -= cf->case_cnt * cf->case_acct_size;        case_bytes -= cf->case_cnt * cf->case_acct_size;
# Line 549  reader_open_file (struct casereader *rea Line 549  reader_open_file (struct casereader *rea
549      }      }
550    else    else
551      {      {
552        reader->buffer = xmalloc (cf->buffer_size * sizeof *cf->buffer);        reader->buffer = xnmalloc (cf->buffer_size, sizeof *cf->buffer);
553        memset (reader->buffer, 0, cf->buffer_size * sizeof *cf->buffer);        memset (reader->buffer, 0, cf->buffer_size * sizeof *cf->buffer);
554      }      }
555    

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26