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

Remove const type cast

Browse Source
This commit is contained in:
Alexey Romanov
2011-01-24 11:50:08 +03:00
parent 7c4ccd419e
commit 2cfabf6d75
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
c_src/sqlite3_drv.c
View File

@@ -242,15 +242,14 @@ static inline int sql_exec_statement(
static int sql_exec(sqlite3_drv_t *drv, char *command, int command_size) { static int sql_exec(sqlite3_drv_t *drv, char *command, int command_size) {
int result; int result;
char *rest = NULL; const char *rest = NULL;
sqlite3_stmt *statement; sqlite3_stmt *statement;
#ifdef DEBUG #ifdef DEBUG
fprintf(drv->log, "Preexec: %.*s\n", command_size, command); fprintf(drv->log, "Preexec: %.*s\n", command_size, command);
fflush(drv->log); fflush(drv->log);
#endif #endif
result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, &rest);
(const char **) &rest);
if ((result != SQLITE_OK) || (statement == NULL)) { if ((result != SQLITE_OK) || (statement == NULL)) {
return output_db_error(drv); return output_db_error(drv);
} }
@@ -441,7 +440,7 @@ static int sql_bind_and_exec(sqlite3_drv_t *drv, char *buffer, int buffer_size)
int result; int result;
int index = 0; int index = 0;
int type, size; int type, size;
char *rest = NULL; const char *rest = NULL;
sqlite3_stmt *statement; sqlite3_stmt *statement;
long bin_size; long bin_size;
char *command; char *command;
@@ -469,8 +468,7 @@ static int sql_bind_and_exec(sqlite3_drv_t *drv, char *buffer, int buffer_size)
command = driver_alloc(size * sizeof(char)); command = driver_alloc(size * sizeof(char));
ei_decode_binary(buffer, &index, command, &bin_size); ei_decode_binary(buffer, &index, command, &bin_size);
// assert(bin_size == size) // assert(bin_size == size)
result = sqlite3_prepare_v2(drv->db, command, size, &statement, result = sqlite3_prepare_v2(drv->db, command, size, &statement, &rest);
(const char **) &rest);
driver_free(command); driver_free(command);
if ((result != SQLITE_OK) || (statement == NULL)) { if ((result != SQLITE_OK) || (statement == NULL)) {
@@ -917,7 +915,7 @@ static void ready_async(ErlDrvData drv_data, ErlDrvThreadData thread_data) {
static int prepare(sqlite3_drv_t *drv, char *command, int command_size) { static int prepare(sqlite3_drv_t *drv, char *command, int command_size) {
int result; int result;
char *rest = NULL; const char *rest = NULL;
sqlite3_stmt *statement; sqlite3_stmt *statement;
ErlDrvTermData spec[6]; ErlDrvTermData spec[6];
@@ -925,8 +923,7 @@ static int prepare(sqlite3_drv_t *drv, char *command, int command_size) {
fprintf(drv->log, "Preparing statement: %.*s\n", command_size, command); fprintf(drv->log, "Preparing statement: %.*s\n", command_size, command);
fflush(drv->log); fflush(drv->log);
#endif #endif
result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, result = sqlite3_prepare_v2(drv->db, command, command_size, &statement, &rest);
(const char **) &rest);
if ((result != SQLITE_OK) || (statement == NULL)) { if ((result != SQLITE_OK) || (statement == NULL)) {
return output_db_error(drv); return output_db_error(drv);
} }