projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.
[pspp]
/
src
/
language
/
data-io
/
data-list.c
diff --git
a/src/language/data-io/data-list.c
b/src/language/data-io/data-list.c
index a6ed9563028ccca519ec4f5a68fd0ff13262c606..02cabd8cde0ca3df01042945eec85299df164e2b 100644
(file)
--- a/
src/language/data-io/data-list.c
+++ b/
src/language/data-io/data-list.c
@@
-331,21
+331,21
@@
parse_fixed (struct lexer *lexer, struct dictionary *dict,
while (lex_token (lexer) != T_ENDCMD)
{
char **names;
while (lex_token (lexer) != T_ENDCMD)
{
char **names;
- size_t n
ame_cnt
, name_idx;
+ size_t n
_names
, name_idx;
struct fmt_spec *formats, *f;
struct fmt_spec *formats, *f;
- size_t
format_cnt
;
+ size_t
n_formats
;
/* Parse everything. */
if (!parse_record_placement (lexer, &record, &column)
|| !parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
/* Parse everything. */
if (!parse_record_placement (lexer, &record, &column)
|| !parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
- &names, &n
ame_cnt
, PV_NONE)
- || !parse_var_placements (lexer, tmp_pool, n
ame_cnt
, FMT_FOR_INPUT,
- &formats, &
format_cnt
))
+ &names, &n
_names
, PV_NONE)
+ || !parse_var_placements (lexer, tmp_pool, n
_names
, FMT_FOR_INPUT,
+ &formats, &
n_formats
))
return false;
/* Create variables and var specs. */
name_idx = 0;
return false;
/* Create variables and var specs. */
name_idx = 0;
- for (f = formats; f < &formats[
format_cnt
]; f++)
+ for (f = formats; f < &formats[
n_formats
]; f++)
if (!execute_placement_format (f, &record, &column))
{
char *name;
if (!execute_placement_format (f, &record, &column))
{
char *name;
@@
-407,7
+407,7
@@
parse_fixed (struct lexer *lexer, struct dictionary *dict,
column += f->w;
}
column += f->w;
}
- assert (name_idx == n
ame_cnt
);
+ assert (name_idx == n
_names
);
}
return true;
}
return true;
@@
-427,11
+427,11
@@
parse_free (struct lexer *lexer, struct dictionary *dict,
{
struct fmt_spec input, output;
char **name;
{
struct fmt_spec input, output;
char **name;
- size_t n
ame_cnt
;
+ size_t n
_names
;
size_t i;
if (!parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
size_t i;
if (!parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
- &name, &n
ame_cnt
, PV_NONE))
+ &name, &n
_names
, PV_NONE))
return false;
if (lex_match (lexer, T_LPAREN))
return false;
if (lex_match (lexer, T_LPAREN))
@@
-475,7
+475,7
@@
parse_free (struct lexer *lexer, struct dictionary *dict,
output = *settings_get_format ();
}
output = *settings_get_format ();
}
- for (i = 0; i < n
ame_cnt
; i++)
+ for (i = 0; i < n
_names
; i++)
{
struct variable *v;
{
struct variable *v;