forks/erlang-sqlite3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced deprecated function driver_output_term

Browse Source 
From erl_driver.h:

	driver_output_term() is deprecated, and scheduled for removal in
	OTP-R17. Use erl_drv_output_term() instead.
This commit is contained in:
András Veres-Szentkirályi
2013-09-18 13:45:32 +02:00
parent b0f95b7774
commit 34f43d429f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
c_src/sqlite3_drv.c
View File

@@ -230,7 +230,7 @@ static inline int output_error(
term_count += 2;
dataset[11] = ERL_DRV_TUPLE;
dataset[12] = 2;
driver_output_term(drv->port, dataset, term_count);
erl_drv_output_term(dataset[1], dataset, term_count);
return 0;
}
@@ -245,7 +245,7 @@ static inline int output_ok(sqlite3_drv_t *drv) {
ERL_DRV_ATOM, drv->atom_ok,
ERL_DRV_TUPLE, 2
};
return driver_output_term(drv->port, spec, sizeof(spec) / sizeof(spec[0]));
return erl_drv_output_term(spec[1], spec, sizeof(spec) / sizeof(spec[0]));
}
static int enable_load_extension(sqlite3_drv_t* drv, char *buf, int len) {
@@ -1069,7 +1069,7 @@ static void ready_async(ErlDrvData drv_data, ErlDrvThreadData thread_data) {
(async_sqlite3_command *) thread_data;
sqlite3_drv_t *drv = async_command->driver_data;
int res = driver_output_term(drv->port,
int res = erl_drv_output_term(driver_mk_port(drv->port),
async_command->dataset,
async_command->term_count);
(void) res; // suppress unused warning
@@ -1114,7 +1114,7 @@ static int prepare(sqlite3_drv_t *drv, char *command, int command_size) {
spec[3] = drv->prepared_count - 1;
spec[4] = ERL_DRV_TUPLE;
spec[5] = 2;
return driver_output_term(drv->port, spec, sizeof(spec) / sizeof(spec[0]));
return erl_drv_output_term(spec[1], spec, sizeof(spec) / sizeof(spec[0]));
}
static int prepared_bind(sqlite3_drv_t *drv, char *buffer, int buffer_size) {
@@ -1152,7 +1152,7 @@ static int prepared_columns(sqlite3_drv_t *drv, char *buffer, int buffer_size) {
long long_prepared_index;
int index = 0, term_count = 0, term_allocated = 0, column_count;
sqlite3_stmt *statement;
ErlDrvTermData *dataset = NULL;
ErlDrvTermData *dataset = NULL, port;
ptr_list* ptrs = NULL;
ei_decode_version(buffer, &index, NULL);
@@ -1175,8 +1175,9 @@ static int prepared_columns(sqlite3_drv_t *drv, char *buffer, int buffer_size) {
term_allocated = max(term_count, term_allocated*2);
dataset = driver_realloc(dataset, sizeof(ErlDrvTermData) * term_allocated);
}
port = driver_mk_port(drv->port);
dataset[term_count - 4] = ERL_DRV_PORT;
dataset[term_count - 3] = driver_mk_port(drv->port);
dataset[term_count - 3] = port;
column_count = sqlite3_column_count(statement);
@@ -1185,7 +1186,7 @@ static int prepared_columns(sqlite3_drv_t *drv, char *buffer, int buffer_size) {
dataset[term_count - 2] = ERL_DRV_TUPLE;
dataset[term_count - 1] = 2;
driver_output_term(drv->port, dataset, term_count);
erl_drv_output_term(port, dataset, term_count);
free_ptr_list(ptrs, driver_free_fun);
return 0;
}
@@ -1305,7 +1306,7 @@ static int unknown(sqlite3_drv_t *drv, char *command, int command_size) {
ERL_DRV_ATOM, drv->atom_unknown_cmd,
ERL_DRV_TUPLE, 4
};
return driver_output_term(drv->port, spec, sizeof(spec) / sizeof(spec[0]));
return erl_drv_output_term(spec[1], spec, sizeof(spec) / sizeof(spec[0]));
}
static inline ptr_list *add_to_ptr_list(ptr_list *list, void *value_ptr) {