projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in val_labs_remove.
[pspp]
/
src
/
casefile.c
diff --git
a/src/casefile.c
b/src/casefile.c
index 9c3da66023384390cf3018d61a202abee95d851c..aea4a14755565c3c0581a4ea40fd0012c9e4a77f 100644
(file)
--- a/
src/casefile.c
+++ b/
src/casefile.c
@@
-344,12
+344,12
@@
casefile_append (struct casefile *cf, const struct ccase *c)
if ((block_idx & (block_idx - 1)) == 0)
{
size_t block_cap = block_idx == 0 ? 1 : block_idx * 2;
if ((block_idx & (block_idx - 1)) == 0)
{
size_t block_cap = block_idx == 0 ? 1 : block_idx * 2;
- cf->cases = xrealloc (cf->cases,
-
sizeof *cf->cases * block_cap
);
+ cf->cases = x
n
realloc (cf->cases,
+
block_cap, sizeof *cf->cases
);
}
}
- cf->cases[block_idx] = x
malloc (sizeof **cf->cases
-
* CASES_PER_BLOCK
);
+ cf->cases[block_idx] = x
nmalloc (CASES_PER_BLOCK,
+
sizeof **cf->cases
);
}
case_move (&cf->cases[block_idx][case_idx], &new_case);
}
case_move (&cf->cases[block_idx][case_idx], &new_case);
@@
-424,7
+424,7
@@
casefile_to_disk (const struct casefile *cf_)
cf->storage = DISK;
if (!make_temp_file (&cf->fd, &cf->filename))
err_failure ();
cf->storage = DISK;
if (!make_temp_file (&cf->fd, &cf->filename))
err_failure ();
- cf->buffer = x
malloc (cf->buffer_size *
sizeof *cf->buffer);
+ cf->buffer = x
nmalloc (cf->buffer_size,
sizeof *cf->buffer);
memset (cf->buffer, 0, cf->buffer_size * sizeof *cf->buffer);
case_bytes -= cf->case_cnt * cf->case_acct_size;
memset (cf->buffer, 0, cf->buffer_size * sizeof *cf->buffer);
case_bytes -= cf->case_cnt * cf->case_acct_size;
@@
-549,7
+549,7
@@
reader_open_file (struct casereader *reader)
}
else
{
}
else
{
- reader->buffer = x
malloc (cf->buffer_size *
sizeof *cf->buffer);
+ reader->buffer = x
nmalloc (cf->buffer_size,
sizeof *cf->buffer);
memset (reader->buffer, 0, cf->buffer_size * sizeof *cf->buffer);
}
memset (reader->buffer, 0, cf->buffer_size * sizeof *cf->buffer);
}