projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: New functions for parsing real numbers in specified ranges.
[pspp]
/
src
/
data
/
psql-reader.c
diff --git
a/src/data/psql-reader.c
b/src/data/psql-reader.c
index f4c44a177f5b53dea84405aae9ae5b5f6b2663f2..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;
casenumber n_cases = CASENUMBER_MAX;
const char *encoding;
- struct psql_reader *r =
xzalloc (sizeof *
r);
+ struct psql_reader *r =
XZALLOC (struct psql_reade
r);
struct string query ;
r->conn = PQconnectdb (info->conninfo);
struct string query ;
r->conn = PQconnectdb (info->conninfo);
@@
-372,7
+372,7
@@
psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
for (i = 0 ; i < n_fields ; ++i)
{
struct variable *var;
for (i = 0 ; i < n_fields ; ++i)
{
struct variable *var;
- struct fmt_spec fmt = {
FMT_F, 8, 2
};
+ struct fmt_spec fmt = {
.type = FMT_F, .w = 8, .d = 2
};
Oid type = PQftype (qres, i);
int width = 0;
int length ;
Oid type = PQftype (qres, i);
int width = 0;
int length ;
@@
-615,7
+615,7
@@
set_value (struct psql_reader *r)
case INTERVALOID:
case TIMESTAMPTZOID:
case TIMETZOID:
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);
{
const struct variable *v1 = NULL;
v1 = dict_get_var (r->dict, var_get_dict_index (v) + 1);