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

Removed warnings when compiling under MSVC

Browse Source
This commit is contained in:
Alexey Romanov
2010-12-12 10:59:58 +03:00
parent f9d21ff6db
commit cf864c1a13
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build_win.bat
View File

@@ -4,5 +4,4 @@ set ERL_ROOT="F:\ProgLangs\erl"
set ERL_INTERFACE="%ERL_ROOT%\lib\erl_interface-3.7.2" set ERL_INTERFACE="%ERL_ROOT%\lib\erl_interface-3.7.2"
set ERTS="%ERL_ROOT%\erts-5.8.2" set ERTS="%ERL_ROOT%\erts-5.8.2"
set SQLITE_SRC="F:\MyProgramming\sqlite-amalgamation" set SQLITE_SRC="F:\MyProgramming\sqlite-amalgamation"
cl -I%ERL_INTERFACE%/include -I%ERTS%/include -I%SQLITE_SRC% c_src/*.c /link /dll %ERL_INTERFACE%\lib\ei.lib %SQLITE_SRC%\sqlite3.lib /out:priv\sqlite3_drv.dll cl /W4 /wd4100 /wd4204 /I%ERL_INTERFACE%/include /I%ERTS%/include /I%SQLITE_SRC% /Ic_src c_src/*.c /link /dll %ERL_INTERFACE%\lib\ei.lib %SQLITE_SRC%\sqlite3.lib /out:priv\sqlite3_drv.dll

15
c_src/sqlite3_drv.c
View File

@@ -134,7 +134,6 @@ static int control(
ErlDrvData drv_data, unsigned int command, char *buf, ErlDrvData drv_data, unsigned int command, char *buf,
int len, char **rbuf, int rlen) { int len, char **rbuf, int rlen) {
sqlite3_drv_t* driver_data = (sqlite3_drv_t*) drv_data; sqlite3_drv_t* driver_data = (sqlite3_drv_t*) drv_data;
int i;
switch (command) { switch (command) {
case CMD_SQL_EXEC: case CMD_SQL_EXEC:
sql_exec(driver_data, buf, len); sql_exec(driver_data, buf, len);
@@ -334,7 +333,7 @@ static int bind_parameters(
sqlite3_drv_t *drv, char *buffer, int buffer_size, int *p_index, sqlite3_drv_t *drv, char *buffer, int buffer_size, int *p_index,
sqlite3_stmt *statement, int *p_type, int *p_size) { sqlite3_stmt *statement, int *p_type, int *p_size) {
// decoding parameters // decoding parameters
int i, cur_list_size = -1, param_index = 1, param_indices_are_explicit = 0, result; int i, cur_list_size = -1, param_index = 1, param_indices_are_explicit = 0, result = 0;
long param_index_long; long param_index_long;
char param_name[MAXATOMLEN + 1]; // parameter names shouldn't be longer than 256! char param_name[MAXATOMLEN + 1]; // parameter names shouldn't be longer than 256!
while (*p_index < buffer_size) { while (*p_index < buffer_size) {
@@ -689,7 +688,9 @@ static void sql_exec_async(void *_async_command) {
dataset[term_count - 2] = ERL_DRV_LIST; dataset[term_count - 2] = ERL_DRV_LIST;
dataset[term_count - 1] = 3; dataset[term_count - 1] = 3;
} else if (sql_is_insert(sqlite3_sql(statement))) { } else if (sql_is_insert(sqlite3_sql(statement))) {
sqlite3_int64 rowid = sqlite3_last_insert_rowid(drv->db); ErlDrvSInt64 *rowid_ptr = driver_alloc(sizeof(ErlDrvSInt64));
*rowid_ptr = (ErlDrvSInt64) sqlite3_last_insert_rowid(drv->db);
ptrs = add_to_ptr_list(ptrs, rowid_ptr);
term_count += 6; term_count += 6;
if (term_count > term_allocated) { if (term_count > term_allocated) {
term_allocated = max(term_count, term_allocated*2); term_allocated = max(term_count, term_allocated*2);
@@ -697,8 +698,8 @@ static void sql_exec_async(void *_async_command) {
} }
dataset[term_count - 6] = ERL_DRV_ATOM; dataset[term_count - 6] = ERL_DRV_ATOM;
dataset[term_count - 5] = drv->atom_rowid; dataset[term_count - 5] = drv->atom_rowid;
dataset[term_count - 4] = ERL_DRV_INT; dataset[term_count - 4] = ERL_DRV_INT64;
dataset[term_count - 3] = rowid; dataset[term_count - 3] = (ErlDrvTermData) rowid_ptr;
dataset[term_count - 2] = ERL_DRV_TUPLE; dataset[term_count - 2] = ERL_DRV_TUPLE;
dataset[term_count - 1] = 2; dataset[term_count - 1] = 2;
} else { } else {
@@ -1025,11 +1026,9 @@ static int prepared_columns(sqlite3_drv_t *drv, char *buffer, int buffer_size) {
} }
static int prepared_step(sqlite3_drv_t *drv, char *buffer, int buffer_size) { static int prepared_step(sqlite3_drv_t *drv, char *buffer, int buffer_size) {
int result;
unsigned int prepared_index; unsigned int prepared_index;
long long_prepared_index; long long_prepared_index;
int index = 0; int index = 0;
char *rest = NULL;
sqlite3_stmt *statement; sqlite3_stmt *statement;
async_sqlite3_command *async_command; async_sqlite3_command *async_command;
@@ -1148,7 +1147,7 @@ static int unknown(sqlite3_drv_t *drv, char *command, int command_size) {
ErlDrvTermData spec[] = { ErlDrvTermData spec[] = {
ERL_DRV_PORT, driver_mk_port(drv->port), ERL_DRV_PORT, driver_mk_port(drv->port),
ERL_DRV_ATOM, drv->atom_error, ERL_DRV_ATOM, drv->atom_error,
ERL_DRV_INT, -1, ERL_DRV_INT, (ErlDrvTermData) ((ErlDrvSInt) -1),
ERL_DRV_ATOM, drv->atom_unknown_cmd, ERL_DRV_ATOM, drv->atom_unknown_cmd,
ERL_DRV_TUPLE, 4 ERL_DRV_TUPLE, 4
}; };

2
c_src/sqlite3_drv.h
View File

@@ -3,6 +3,8 @@
#define __WIN32__ #define __WIN32__
#endif #endif
#define _CRT_SECURE_NO_WARNINGS // secure functions aren't cross-platform
#include <erl_driver.h> #include <erl_driver.h>
#include <erl_interface.h> #include <erl_interface.h>
#include <ei.h> #include <ei.h>