diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index d9bd3691391ad80a0728a2f9ac88c03033627fa4..de2348e713d34e82924bbf4870d252d186626803 100644 (file)
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "utils/dbi.h"
#include "utils/error.h"
char *database;
dbi_conn conn;
+ dbi_inst inst;
sdb_dbi_options_t *options;
};
data->data.decimal = dbi_result_get_double_idx(res, i);
break;
case SDB_TYPE_STRING:
- data->data.string = dbi_result_get_string_idx(res, i);
+ data->data.string = dbi_result_get_string_copy_idx(res, i);
break;
case SDB_TYPE_DATETIME:
{
case SDB_TYPE_BINARY:
{
size_t length = dbi_result_get_field_length_idx(res, i);
- const unsigned char *datum = dbi_result_get_binary_idx(res, i);
+ unsigned char *datum = dbi_result_get_binary_copy_idx(res, i);
data->data.binary.length = length;
data->data.binary.datum = datum;
}
return -1;
for (n = 0; n < num_rows; ++n) {
+ int status;
+
if (! dbi_result_seek_row(res, n + 1)) {
sdb_log(SDB_LOG_ERR, "dbi: Failed to retrieve row %llu: %s",
n, sdb_dbi_strerror(client->conn));
types[i], &data[i]))
continue;
- if (callback(client, num_fields, data, user_data))
+ status = callback(client, num_fields, data, user_data);
+ for (i = 0; i < num_fields; ++i)
+ sdb_data_free_datum(&data[i]);
+
+ if (status)
continue;
++success;
{
sdb_dbi_options_t *options;
- options = malloc(sizeof(options));
+ options = malloc(sizeof(*options));
if (! options)
return NULL;
client->conn = NULL;
client->options = NULL;
+ if (dbi_initialize_r(/* driverdir = */ NULL, &client->inst) < 0) {
+ free(client);
+ return NULL;
+ }
+
client->driver = strdup(driver);
client->database = strdup(database);
if ((! client->driver) || (! client->database)) {
client->conn = NULL;
}
- driver = dbi_driver_open(client->driver);
+ driver = dbi_driver_open_r(client->driver, client->inst);
if (! driver) {
sdb_error_set("dbi: failed to open DBI driver '%s'; "
"possibly it's not installed.\n",
client->driver);
sdb_error_append("dbi: known drivers:\n");
- for (driver = dbi_driver_list(NULL); driver;
- driver = dbi_driver_list(driver)) {
+ for (driver = dbi_driver_list_r(NULL, client->inst); driver;
+ driver = dbi_driver_list_r(driver, client->inst)) {
sdb_error_append("\t- %s\n", dbi_driver_get_name(driver));
}
sdb_error_chomp();
dbi_conn_close(client->conn);
client->conn = NULL;
+ dbi_shutdown_r(client->inst);
+
if (client->options)
sdb_dbi_options_destroy(client->options);
client->options = NULL;