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

[pspp] / src / data / psql-reader.c

diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c
index 6780138b08da038015f0022ef81b59e606a2e2ce..ae56d18212b5eb86873835e6e8dc150285f544b6 100644 (file)
--- a/src/data/psql-reader.c
+++ b/src/data/psql-reader.c
@@ -233,7 +233,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
   casenumber n_cases = CASENUMBER_MAX;
   const char *encoding;
 
-  struct psql_reader *r = xzalloc (sizeof *r);
+  struct psql_reader *r = XZALLOC (struct psql_reader);
   struct string query ;
 
   r->conn = PQconnectdb (info->conninfo);
@@ -615,7 +615,7 @@ set_value (struct psql_reader *r)
        case INTERVALOID:
        case TIMESTAMPTZOID:
        case TIMETZOID:
-         if (i < r->vmapsize && var_get_dict_index(v) + 1 < dict_get_var_cnt (r->dict))
+         if (i < r->vmapsize && var_get_dict_index(v) + 1 < dict_get_n_vars (r->dict))
            {
              const struct variable *v1 = NULL;
              v1 = dict_get_var (r->dict, var_get_dict_index (v) + 1);