X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Futils%2Fdbi.c;h=a2569f7faac01a92b66eb211c3bb543bd2eb0736;hp=dc1d6e4fc3af78460366c714e21146d9dfe31869;hb=39a45905e0b237e458b1826ff9b4fad1c4a59550;hpb=a6bb88e99588be4c62aa7a81bfae643b3c1888fa

diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index dc1d6e4..a2569f7 100644
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "utils/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,14 +100,14 @@ 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;
 			}
 			break;
 		default:
-			sdb_error_set(SDB_LOG_ERR, "dbi: Unexpected type %i while "
-					"parsing query result.\n", type);
+			sdb_log(SDB_LOG_ERR, "dbi: Unexpected type %i while "
+					"parsing query result.", type);
 			return -1;
 	}
 
@@ -129,7 +133,7 @@ sdb_dbi_get_data(sdb_dbi_client_t *client, dbi_result res,
 	for (i = 0; i < num_fields; ++i) {
 		types[i] = dbi_result_get_field_type_idx(res, i + 1);
 		if (types[i] == DBI_TYPE_ERROR) {
-			sdb_error_set(SDB_LOG_ERR, "dbi: failed to fetch data: %s\n",
+			sdb_log(SDB_LOG_ERR, "dbi: failed to fetch data: %s",
 					sdb_dbi_strerror(client->conn));
 			return -1;
 		}
@@ -141,9 +145,11 @@ 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_error_set(SDB_LOG_ERR, "dbi: Failed to retrieve row %llu: "
-					"%s\n", n, sdb_dbi_strerror(client->conn));
+			sdb_log(SDB_LOG_ERR, "dbi: Failed to retrieve row %llu: %s",
+					n, sdb_dbi_strerror(client->conn));
 			continue;
 		}
 
@@ -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,12 +294,14 @@ 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) {
-		sdb_error_start(SDB_LOG_ERR, "dbi: failed to open DBI driver '%s'; "
+		sdb_error_set("dbi: failed to open DBI driver '%s'; "
 				"possibly it's not installed.\n",
 				client->driver);
 
@@ -298,14 +310,15 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 				driver = dbi_driver_list(driver)) {
 			sdb_error_append("\t- %s\n", dbi_driver_get_name(driver));
 		}
-		sdb_error_finish();
+		sdb_error_chomp();
+		sdb_error_log(SDB_LOG_ERR);
 		return -1;
 	}
 
 	client->conn = dbi_conn_open(driver);
 	if (! client->conn) {
-		sdb_error_set(SDB_LOG_ERR, "dbi: failed to open connection "
-				"object.\n");
+		sdb_log(SDB_LOG_ERR, "dbi: failed to open connection "
+				"object.");
 		return -1;
 	}
 
@@ -319,32 +332,36 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 				continue;
 			/* else: error */
 
-			sdb_error_start(SDB_LOG_ERR, "dbi: failed to set option '%s': "
-					"%s\n", client->options->options[i].key,
+			sdb_error_set("dbi: failed to set option '%s': %s\n",
+					client->options->options[i].key,
 					sdb_dbi_strerror(client->conn));
 
 			sdb_error_append("dbi: known driver options:\n");
 			for (opt = dbi_conn_get_option_list(client->conn, NULL); opt;
 					opt = dbi_conn_get_option_list(client->conn, opt))
 				sdb_error_append("\t- %s\n", opt);
-			sdb_error_finish();
+			sdb_error_chomp();
+			sdb_error_log(SDB_LOG_ERR);
 
 			dbi_conn_close(client->conn);
+			client->conn = NULL;
 			return -1;
 		}
 	}
 
 	if (dbi_conn_set_option(client->conn, "dbname", client->database)) {
-		sdb_error_set(SDB_LOG_ERR, "dbi: failed to set option 'dbname': %s\n",
+		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;
 	}
 
 	if (dbi_conn_connect(client->conn) < 0) {
-		sdb_error_set(SDB_LOG_ERR, "dbi: failed to connect to database '%s': "
-				"%s\n", client->database, sdb_dbi_strerror(client->conn));
+		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;
@@ -378,14 +395,14 @@ sdb_dbi_exec_query(sdb_dbi_client_t *client, const char *query,
 
 	res = dbi_conn_query(client->conn, query);
 	if (! res) {
-		sdb_error_set(SDB_LOG_ERR, "dbi: failed to execute query '%s': %s\n",
+		sdb_log(SDB_LOG_ERR, "dbi: failed to execute query '%s': %s",
 				query, sdb_dbi_strerror(client->conn));
 		return -1;
 	}
 
 	if (dbi_result_get_numrows(res) == DBI_ROW_ERROR) {
-		sdb_error_set(SDB_LOG_ERR, "dbi: failed to fetch rows for query "
-				"'%s': %s\n", query, sdb_dbi_strerror(client->conn));
+		sdb_log(SDB_LOG_ERR, "dbi: failed to fetch rows for query "
+				"'%s': %s", query, sdb_dbi_strerror(client->conn));
 		dbi_result_free(res);
 		return -1;
 	}
@@ -402,9 +419,9 @@ sdb_dbi_exec_query(sdb_dbi_client_t *client, const char *query,
 		int i;
 
 		if (n != (int)num_fields) {
-			sdb_error_set(SDB_LOG_ERR, "dbi: number of returned fields (%i) "
+			sdb_log(SDB_LOG_ERR, "dbi: number of returned fields (%i) "
 					"does not match the number of requested fields (%i) "
-					"for query '%s'.\n", num_fields, n, query);
+					"for query '%s'.", num_fields, n, query);
 			dbi_result_free(res);
 			return -1;
 		}
@@ -422,8 +439,8 @@ sdb_dbi_exec_query(sdb_dbi_client_t *client, const char *query,
 
 			/* column count starts at 1 */
 			if ((unsigned int)field_type != type) {
-				sdb_error_set(SDB_LOG_ERR, "dbi: type of column '%s' (%u) "
-						"does not match requested type (%u).\n",
+				sdb_log(SDB_LOG_ERR, "dbi: type of column '%s' (%u) "
+						"does not match requested type (%u).",
 						dbi_result_get_field_name(res, (unsigned int)i + 1),
 						field_type, type);
 				status = -1;
@@ -465,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);