/[pspp]/pspp/src/matrix-data.c
ViewVC logotype

Diff of /pspp/src/matrix-data.c

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

revision 1.32 by blp, Mon Oct 24 02:51:32 2005 UTC revision 1.33 by blp, Wed Oct 26 05:06:14 2005 UTC
# Line 961  read_matrices_without_rowtype (struct ma Line 961  read_matrices_without_rowtype (struct ma
961    
962    nr.mx = mx;    nr.mx = mx;
963    nr.data = NULL;    nr.data = NULL;
964    nr.factor_values = xmalloc (sizeof *nr.factor_values    nr.factor_values = xnmalloc (mx->n_factors * mx->cells,
965                                * mx->n_factors * mx->cells);                                 sizeof *nr.factor_values);
966    nr.max_cell_idx = 0;    nr.max_cell_idx = 0;
967    nr.split_values = xmalloc (sizeof *nr.split_values    nr.split_values = xnmalloc (dict_get_split_cnt (default_dict),
968                               * dict_get_split_cnt (default_dict));                                sizeof *nr.split_values);
969    
970    vfm_source = create_case_source (&matrix_data_without_rowtype_source_class, &nr);    vfm_source = create_case_source (&matrix_data_without_rowtype_source_class, &nr);
971        
# Line 1549  wr_read_splits (struct wr_aux_data *wr, Line 1549  wr_read_splits (struct wr_aux_data *wr,
1549    else    else
1550      {      {
1551        compare = 0;        compare = 0;
1552        wr->split_values = xmalloc (split_cnt * sizeof *wr->split_values);        wr->split_values = xnmalloc (split_cnt, sizeof *wr->split_values);
1553      }      }
1554        
1555    {    {
# Line 1644  wr_output_data (struct wr_aux_data *wr, Line 1644  wr_output_data (struct wr_aux_data *wr,
1644      struct factor_data *iter;      struct factor_data *iter;
1645      int i;      int i;
1646    
1647      factors = xmalloc (sizeof *factors * mx->cells);      factors = xnmalloc (mx->cells, sizeof *factors);
1648    
1649      for (i = 0, iter = wr->data; iter; iter = iter->next, i++)      for (i = 0, iter = wr->data; iter; iter = iter->next, i++)
1650        factors[i] = iter;        factors[i] = iter;

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.33

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