treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / data / case-map.c

diff --git a/src/data/case-map.c b/src/data/case-map.c
index 3cbe24792a2a1725e1ac09bfc20aa7fbfc3a04ad..ed32db0d3fc940cf9d14cd74de02889b9a6721a0 100644 (file)
--- a/src/data/case-map.c
+++ b/src/data/case-map.c
@@ -120,7 +120,7 @@ case_map_get_proto (const struct case_map *map)
 }
 
 /* Creates and returns a new casereader whose cases are produced
-   by reading from SUBREADER and executing the actions of MAP.  
+   by reading from SUBREADER and executing the actions of MAP.
    The casereader will have as many `union value's as MAP.  When
    the new casereader is destroyed, MAP will be destroyed too.
 
@@ -129,7 +129,7 @@ case_map_get_proto (const struct case_map *map)
    when the returned casereader is destroyed. */
 struct casereader *
 case_map_create_input_translator (struct case_map *map,
-                                  struct casereader *subreader) 
+                                  struct casereader *subreader)
 {
     return casereader_create_translator (subreader,
                                          case_map_get_proto (map),
@@ -149,7 +149,7 @@ case_map_create_input_translator (struct case_map *map,
    when the returned casewriter is destroyed. */
 struct casewriter *
 case_map_create_output_translator (struct case_map *map,
-                                   struct casewriter *subwriter) 
+                                   struct casewriter *subwriter)
 {
     return casewriter_create_translator (subwriter,
                                          case_map_get_proto (map),
@@ -189,7 +189,7 @@ struct case_map *
 case_map_to_compact_dict (const struct dictionary *d,
                           unsigned int exclude_classes)
 {
-  size_t n_vars = dict_get_var_cnt (d);
+  size_t n_vars = dict_get_n_vars (d);
   struct caseproto *proto;
   struct case_map *map;
   size_t n_values;
@@ -234,7 +234,7 @@ struct case_map_stage
 struct case_map_stage *
 case_map_stage_create (const struct dictionary *dict)
 {
-  size_t n_vars = dict_get_var_cnt (dict);
+  size_t n_vars = dict_get_n_vars (dict);
   struct case_map_stage *stage;
   size_t i;
 
@@ -305,7 +305,7 @@ struct case_map *
 case_map_stage_get_case_map (const struct case_map_stage *stage)
 {
   struct case_map *map;
-  size_t n_vars = dict_get_var_cnt (stage->dict);
+  size_t n_vars = dict_get_n_vars (stage->dict);
   size_t n_values;
   size_t i;
   bool identity_map = true;
@@ -343,12 +343,9 @@ struct case_map *
 case_map_by_name (const struct dictionary *old,
                   const struct dictionary *new)
 {
-  struct case_map *map;
-  size_t var_cnt = dict_get_var_cnt (new);
-  size_t i;
-
-  map = create_case_map (dict_get_proto (new));
-  for (i = 0; i < var_cnt; i++)
+  size_t n_vars = dict_get_n_vars (new);
+  struct case_map *map = create_case_map (dict_get_proto (new));
+  for (size_t i = 0; i < n_vars; i++)
     {
       struct variable *nv = dict_get_var (new, i);
       struct variable *ov = dict_lookup_var_assert (old, var_get_name (nv));
@@ -364,6 +361,6 @@ void
 case_map_dump (const struct case_map *cm)
 {
   int i;
-  for (i = 0 ; i < caseproto_get_n_widths (cm->proto); ++i )
+  for (i = 0 ; i < caseproto_get_n_widths (cm->proto); ++i)
     printf ("%d -> %d\n", i, cm->map[i]);
 }