[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] sys-file-reader: Improve debugging usefulness of error messa
From: |
Ben Pfaff |
Subject: |
[PATCH 6/9] sys-file-reader: Improve debugging usefulness of error messages. |
Date: |
Sun, 30 Jan 2011 20:37:37 -0800 |
I found that these changes made it easier to debug problems with system
files while I was developing tests.
---
src/data/sys-file-reader.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 8f5d502..17aabf2 100644
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -513,7 +513,6 @@ read_header (struct sfm_reader *r, struct dictionary *dict,
if ( r->case_cnt > INT_MAX / 2)
r->case_cnt = -1;
-
/* Identify floating-point format and obtain compression bias. */
read_bytes (r, raw_bias, sizeof raw_bias);
if (float_identify (100.0, raw_bias, sizeof raw_bias, &r->float_format) == 0)
@@ -772,7 +771,9 @@ setup_weight (struct sfm_reader *r, int weight_idx,
if (var_is_numeric (weight_var))
dict_set_weight (dict, weight_var);
else
- sys_error (r, _("Weighting variable must be numeric."));
+ sys_error (r, _("Weighting variable must be numeric "
+ "(not string variable `%s')."),
+ var_get_name (weight_var));
}
}
@@ -938,7 +939,7 @@ read_machine_integer_info (struct sfm_reader *r, size_t
size, size_t count,
if (float_representation != expected_float_format)
sys_error (r, _("Floating-point representation indicated by "
"system file (%d) differs from expected (%d)."),
- r->float_format, expected_float_format);
+ float_representation, expected_float_format);
/* Check integer format. */
if (r->integer_format == INTEGER_MSB_FIRST)
@@ -948,14 +949,9 @@ read_machine_integer_info (struct sfm_reader *r, size_t
size, size_t count,
else
NOT_REACHED ();
if (integer_representation != expected_integer_format)
- {
- static const char *const endian[] = {N_("Little Endian"), N_("Big
Endian")};
- sys_warn (r, _("Integer format indicated by system file (%s) "
- "differs from expected (%s)."),
- gettext (endian[integer_representation == 1]),
- gettext (endian[expected_integer_format == 1]));
- }
-
+ sys_warn (r, _("Integer format indicated by system file (%d) "
+ "differs from expected (%d)."),
+ integer_representation, expected_integer_format);
/*
Record 7 (20) provides a much more reliable way of
--
1.7.1
- [PATCH 0/9] sys-file-reader fixes and tests, Ben Pfaff, 2011/01/30
- [PATCH 3/9] sys-file-reader: Check that multiple response set names begin with `$'., Ben Pfaff, 2011/01/30
- [PATCH 2/9] sys-file-reader: Fix double-free on read of partial record., Ben Pfaff, 2011/01/30
- [PATCH 7/9] sys-file-reader: Avoid redundant "within system file" in messages., Ben Pfaff, 2011/01/30
- [PATCH 4/9] sys-file-reader: Add missing periods at end of error messages., Ben Pfaff, 2011/01/30
- [PATCH 6/9] sys-file-reader: Improve debugging usefulness of error messages.,
Ben Pfaff <=
- [PATCH 1/9] hash-functions: Use C instead of preprocessor to test size of double., Ben Pfaff, 2011/01/30
- [PATCH 5/9] sys-file-reader: Really enable warnings for invalid variable formats., Ben Pfaff, 2011/01/30
- [PATCH 8/9] sys-file-reader: Elevate invalid number of labels from warning to error., Ben Pfaff, 2011/01/30
- [PATCH 9/9] sys-file-reader: Add tests., Ben Pfaff, 2011/01/30