projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We've had a mix of min, max from libpspp/misc.h and MIN, MAX from
[pspp-builds.git]
/
src
/
data
/
sys-file-reader.c
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index 24054393468f1e4d3a84a01209f0ec95dbefdd46..1b66a4d27757a57e9c162738f12fe8b5e3f3856f 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-439,7
+439,7
@@
sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
break;
}
break;
}
- for ( i = 0 ; i <
min
(n_vars, dict_get_var_cnt(*dict)) ; ++i )
+ for ( i = 0 ; i <
MIN
(n_vars, dict_get_var_cnt(*dict)) ; ++i )
{
struct
{
{
struct
{
@@
-1382,7
+1382,7
@@
read_value_labels (struct sfm_reader *r,
if (var[0]->type == ALPHA)
{
if (var[0]->type == ALPHA)
{
- const int copy_len =
min
(sizeof label->raw_value,
+ const int copy_len =
MIN
(sizeof label->raw_value,
sizeof label->label);
memcpy (label->value.s, label->raw_value, copy_len);
} else {
sizeof label->label);
memcpy (label->value.s, label->raw_value, copy_len);
} else {
@@
-1446,7
+1446,7
@@
buf_read (struct sfm_reader *r, void *buf, size_t byte_cnt, size_t min_alloc)
assert (r);
if (buf == NULL && byte_cnt > 0 )
assert (r);
if (buf == NULL && byte_cnt > 0 )
- buf = xmalloc (
max
(byte_cnt, min_alloc));
+ buf = xmalloc (
MAX
(byte_cnt, min_alloc));
if ( byte_cnt == 0 )
return buf;
if ( byte_cnt == 0 )
return buf;