projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
data
/
psql-reader.c
diff --git
a/src/data/psql-reader.c
b/src/data/psql-reader.c
index 9df82b558c69252930fdf932e0ed5575edd3cfa8..be6d0a60759c45746ea01b660ca35e8f1770064b 100644
(file)
--- a/
src/data/psql-reader.c
+++ b/
src/data/psql-reader.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-37,7
+37,7
@@
#if !PSQL_SUPPORT
struct casereader *
#if !PSQL_SUPPORT
struct casereader *
-psql_open_reader (struct psql_read_info *info
, struct dictionary **dict
)
+psql_open_reader (struct psql_read_info *info
UNUSED, struct dictionary **dict UNUSED
)
{
msg (ME, _("Support for reading postgres databases was not compiled into this installation of PSPP"));
{
msg (ME, _("Support for reading postgres databases was not compiled into this installation of PSPP"));
@@
-75,8
+75,7
@@
psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
static void psql_casereader_destroy (struct casereader *reader UNUSED, void *r_);
static void psql_casereader_destroy (struct casereader *reader UNUSED, void *r_);
-static bool psql_casereader_read (struct casereader *, void *,
- struct ccase *);
+static struct ccase *psql_casereader_read (struct casereader *, void *);
static const struct casereader_class psql_casereader_class =
{
static const struct casereader_class psql_casereader_class =
{
@@
-109,8
+108,7
@@
struct psql_reader
};
};
-static bool set_value (struct psql_reader *r,
- struct ccase *cc);
+static struct ccase *set_value (struct psql_reader *r);
@@
-550,9
+548,8
@@
psql_casereader_destroy (struct casereader *reader UNUSED, void *r_)
-static bool
-psql_casereader_read (struct casereader *reader UNUSED, void *r_,
- struct ccase *cc)
+static struct ccase *
+psql_casereader_read (struct casereader *reader UNUSED, void *r_)
{
struct psql_reader *r = r_;
{
struct psql_reader *r = r_;
@@
-562,24
+559,24
@@
psql_casereader_read (struct casereader *reader UNUSED, void *r_,
return false;
}
return false;
}
- return set_value (r
, cc
);
+ return set_value (r);
}
}
-static bool
-set_value (struct psql_reader *r,
- struct ccase *c)
+static struct ccase *
+set_value (struct psql_reader *r)
{
{
-
int i
;
+
struct ccase *c
;
int n_vars;
int n_vars;
+ int i;
assert (r->res);
n_vars = PQnfields (r->res);
if ( r->tuple >= PQntuples (r->res))
assert (r->res);
n_vars = PQnfields (r->res);
if ( r->tuple >= PQntuples (r->res))
- return
false
;
+ return
NULL
;
- c
ase_create (c,
r->value_cnt);
+ c
= case_create (
r->value_cnt);
memset (case_data_rw_idx (c, 0)->s, ' ', MAX_SHORT_STRING * r->value_cnt);
memset (case_data_rw_idx (c, 0)->s, ' ', MAX_SHORT_STRING * r->value_cnt);
@@
-874,7
+871,7
@@
set_value (struct psql_reader *r,
r->tuple++;
r->tuple++;
- return
true
;
+ return
c
;
}
#endif
}
#endif