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
/
expressions
/
helpers.c
diff --git
a/src/language/expressions/helpers.c
b/src/language/expressions/helpers.c
index 66a7c1a1094b3159049afed8942faaceeb02ee6b..053ada56b555b5215d40b61eddbb7e0f9cf5dea0 100644
(file)
--- a/
src/language/expressions/helpers.c
+++ b/
src/language/expressions/helpers.c
@@
-167,11
+167,11
@@
recognize_unit (struct substring name, enum date_unit *unit)
{ DATE_MINUTES, SS_LITERAL_INITIALIZER ("minutes") },
{ DATE_SECONDS, SS_LITERAL_INITIALIZER ("seconds") },
};
{ DATE_MINUTES, SS_LITERAL_INITIALIZER ("minutes") },
{ DATE_SECONDS, SS_LITERAL_INITIALIZER ("seconds") },
};
- const int
unit_name_cnt
= sizeof unit_names / sizeof *unit_names;
+ const int
n_unit_names
= sizeof unit_names / sizeof *unit_names;
const struct unit_name *un;
const struct unit_name *un;
- for (un = unit_names; un < &unit_names[
unit_name_cnt
]; un++)
+ for (un = unit_names; un < &unit_names[
n_unit_names
]; un++)
if (ss_equals_case (un->name, name))
{
*unit = un->unit;
if (ss_equals_case (un->name, name))
{
*unit = un->unit;
@@
-430,15
+430,12
@@
compare_string_3way (const struct substring *a, const struct substring *b)
}
size_t
}
size_t
-count_valid (double *d, size_t
d_cnt
)
+count_valid (double *d, size_t
n
)
{
{
- size_t valid_cnt;
- size_t i;
-
- valid_cnt = 0;
- for (i = 0; i < d_cnt; i++)
- valid_cnt += is_valid (d[i]);
- return valid_cnt;
+ size_t n_valid = 0;
+ for (size_t i = 0; i < n; i++)
+ n_valid += is_valid (d[i]);
+ return n_valid;
}
struct substring
}
struct substring