projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SORT VARIABLES: Improve stability of sort.
[pspp]
/
src
/
data
/
sys-file-reader.c
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index 6010d77313bb81a23f1442c15e6af808690745d3..b2db755732311d6c6ba8dda47044225edffa80c2 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-2335,7
+2335,14
@@
parse_attributes (struct sfm_reader *r, struct text_record *text,
break;
}
if (attrs != NULL)
break;
}
if (attrs != NULL)
- attrset_add (attrs, attr);
+ {
+ if (!attrset_try_add (attrs, attr))
+ {
+ text_warn (r, text, _("Duplicate attribute %s."),
+ attribute_get_name (attr));
+ attribute_destroy (attr);
+ }
+ }
else
attribute_destroy (attr);
}
else
attribute_destroy (attr);
}
@@
-3497,7
+3504,7
@@
read_ztrailer (struct sfm_reader *r,
if (fstat (fileno (r->file), &s))
{
if (fstat (fileno (r->file), &s))
{
- sys_error (
ME
, 0, _("%s: stat failed (%s)."),
+ sys_error (
r
, 0, _("%s: stat failed (%s)."),
fh_get_file_name (r->fh), strerror (errno));
return false;
}
fh_get_file_name (r->fh), strerror (errno));
return false;
}