projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sys-file-reader: Elevate invalid number of labels from warning to error.
[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 84342369c37fd11a117f202d84aac2698aaee565..8f39f47826c8f6e6a26b2ff08ae7644c33683308 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-604,9
+604,7
@@
read_variable_record (struct sfm_reader *r, struct dictionary *dict,
sys_error (r, _("Bad width %d for variable %s."), width, name);
var = dict_create_var (dict, name, width);
if (var == NULL)
sys_error (r, _("Bad width %d for variable %s."), width, name);
var = dict_create_var (dict, name, width);
if (var == NULL)
- sys_error (r,
- _("Duplicate variable name `%s' within system file."),
- name);
+ sys_error (r, _("Duplicate variable name `%s'."), name);
/* Set the short name the same as the long name. */
var_set_short_name (var, 0, var_get_name (var));
/* Set the short name the same as the long name. */
var_set_short_name (var, 0, var_get_name (var));
@@
-1283,8
+1281,7
@@
read_long_var_name_map (struct sfm_reader *r, size_t size, size_t count,
if (strcasecmp (var_get_short_name (var, 0), long_name)
&& dict_lookup_var (dict, long_name) != NULL)
{
if (strcasecmp (var_get_short_name (var, 0), long_name)
&& dict_lookup_var (dict, long_name) != NULL)
{
- sys_warn (r, _("Duplicate long variable name `%s' "
- "within system file."), long_name);
+ sys_warn (r, _("Duplicate long variable name `%s'."), long_name);
continue;
}
continue;
}
@@
-1411,11
+1408,7
@@
read_value_labels (struct sfm_reader *r,
label_cnt = read_int (r);
if (size_overflow_p (xtimes (label_cnt, sizeof *labels)))
label_cnt = read_int (r);
if (size_overflow_p (xtimes (label_cnt, sizeof *labels)))
- {
- sys_warn (r, _("Invalid number of labels: %d. Ignoring labels."),
- label_cnt);
- label_cnt = 0;
- }
+ sys_error (r, _("Invalid number of labels %d."), label_cnt);
/* Read each value/label tuple into labels[]. */
labels = pool_nalloc (subpool, label_cnt, sizeof *labels);
/* Read each value/label tuple into labels[]. */
labels = pool_nalloc (subpool, label_cnt, sizeof *labels);