Include config.h in source files.

[sysdb.git] / src / utils / dbi.c

diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index db93857fad42d9103d40c24d243fb48511af807e..a2569f7faac01a92b66eb211c3bb543bd2eb0736 100644 (file)
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "core/error.h"
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "utils/dbi.h"
+#include "utils/error.h"
 
 #include <assert.h>
 
@@ -84,7 +88,7 @@ sdb_dbi_get_field(dbi_result res, unsigned int i,
                        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:
                        {
@@ -96,7 +100,7 @@ sdb_dbi_get_field(dbi_result res, unsigned int i,
                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;
                        }
@@ -141,6 +145,8 @@ sdb_dbi_get_data(sdb_dbi_client_t *client, dbi_result res,
                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));
@@ -152,7 +158,11 @@ sdb_dbi_get_data(sdb_dbi_client_t *client, dbi_result res,
                                                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;
@@ -172,7 +182,7 @@ sdb_dbi_options_create(void)
 {
        sdb_dbi_options_t *options;
 
-       options = malloc(sizeof(options));
+       options = malloc(sizeof(*options));
        if (! options)
                return NULL;
 
@@ -284,8 +294,10 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
        if ((! client) || (! client->driver) || (! client->database))
                return -1;
 
-       if (client->conn)
+       if (client->conn) {
                dbi_conn_close(client->conn);
+               client->conn = NULL;
+       }
 
        driver = dbi_driver_open(client->driver);
        if (! driver) {
@@ -332,6 +344,7 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
                        sdb_error_log(SDB_LOG_ERR);
 
                        dbi_conn_close(client->conn);
+                       client->conn = NULL;
                        return -1;
                }
        }
@@ -340,6 +353,7 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
                sdb_log(SDB_LOG_ERR, "dbi: failed to set option 'dbname': %s",
                                sdb_dbi_strerror(client->conn));
                dbi_conn_close(client->conn);
+               client->conn = NULL;
                return -1;
        }
 
@@ -347,6 +361,7 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
                sdb_log(SDB_LOG_ERR, "dbi: failed to connect to database '%s': %s",
                                client->database, sdb_dbi_strerror(client->conn));
                dbi_conn_close(client->conn);
+               client->conn = NULL;
                return -1;
        }
        return 0;
@@ -467,6 +482,7 @@ sdb_dbi_client_destroy(sdb_dbi_client_t *client)
 
        if (client->conn)
                dbi_conn_close(client->conn);
+       client->conn = NULL;
 
        if (client->options)
                sdb_dbi_options_destroy(client->options);