projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Reimplement for better testability and internationalization.
[pspp-builds.git]
/
tests
/
dissect-sysfile.c
diff --git
a/tests/dissect-sysfile.c
b/tests/dissect-sysfile.c
index d5994b3b845f484aa6f6d6e1371488056137304e..444c15cc88bbec3544c017422aecb11b7b700bb3 100644
(file)
--- a/
tests/dissect-sysfile.c
+++ b/
tests/dissect-sysfile.c
@@
-36,7
+36,7
@@
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#define
VAR_NAME
_LEN 64
+#define
ID_MAX
_LEN 64
struct sfm_reader
{
struct sfm_reader
{
@@
-689,8
+689,8
@@
read_mrsets (struct sfm_reader *r, size_t size, size_t count)
if (!text_match (text, ' '))
{
if (!text_match (text, ' '))
{
- sys_warn (r, _("Missing space following `
E
' at offset %zu "
- "in MRSETS record"), text_pos (text));
+ sys_warn (r, _("Missing space following `
%c
' at offset %zu "
+ "in MRSETS record"),
'E',
text_pos (text));
break;
}
break;
}
@@
-925,7
+925,7
@@
read_long_string_value_labels (struct sfm_reader *r, size_t size, size_t count)
while (ftello (r->file) - start < size * count)
{
long long posn = ftello (r->file);
while (ftello (r->file) - start < size * count)
{
long long posn = ftello (r->file);
- char var_name[
VAR_NAME
_LEN + 1];
+ char var_name[
ID_MAX
_LEN + 1];
int var_name_len;
int n_values;
int width;
int var_name_len;
int n_values;
int width;
@@
-933,10
+933,10
@@
read_long_string_value_labels (struct sfm_reader *r, size_t size, size_t count)
/* Read variable name. */
var_name_len = read_int (r);
/* Read variable name. */
var_name_len = read_int (r);
- if (var_name_len >
VAR_NAME
_LEN)
+ if (var_name_len >
ID_MAX
_LEN)
sys_error (r, _("Variable name length in long string value label "
"record (%d) exceeds %d-byte limit."),
sys_error (r, _("Variable name length in long string value label "
"record (%d) exceeds %d-byte limit."),
- var_name_len,
VAR_NAME
_LEN);
+ var_name_len,
ID_MAX
_LEN);
read_string (r, var_name, var_name_len + 1);
/* Read width, number of values. */
read_string (r, var_name, var_name_len + 1);
/* Read width, number of values. */