forks/esqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed static created atoms

Browse Source
This commit is contained in:
Maas-Maarten Zeeman
2011-11-21 23:04:03 +01:00
parent 30c25d0611
commit df30e78b25
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
c_src/esqlite3_nif.c
View File

@@ -49,8 +49,6 @@ typedef struct {
sqlite3_stmt *statement; sqlite3_stmt *statement;
} esqlite_statement; } esqlite_statement;
static ERL_NIF_TERM _atom_ok;
static ERL_NIF_TERM _atom_error;
typedef enum { typedef enum {
cmd_unknown, cmd_unknown,
@@ -88,13 +86,13 @@ make_atom(ErlNifEnv *env, const char *atom_name)
static ERL_NIF_TERM static ERL_NIF_TERM
make_ok_tuple(ErlNifEnv *env, ERL_NIF_TERM value) make_ok_tuple(ErlNifEnv *env, ERL_NIF_TERM value)
{ {
return enif_make_tuple2(env, _atom_ok, value); return enif_make_tuple2(env, make_atom(env, "ok"), value);
} }
static ERL_NIF_TERM static ERL_NIF_TERM
make_error_tuple(ErlNifEnv *env, const char *reason) make_error_tuple(ErlNifEnv *env, const char *reason)
{ {
return enif_make_tuple2(env, _atom_error, make_atom(env, reason)); return enif_make_tuple2(env, make_atom(env, "error"), make_atom(env, reason));
} }
static void static void
@@ -164,7 +162,6 @@ destruct_esqlite_statement(ErlNifEnv *env, void *arg)
esqlite_statement *stmt = (esqlite_statement *) arg; esqlite_statement *stmt = (esqlite_statement *) arg;
if(stmt->statement) { if(stmt->statement) {
/* the statement was not finalized */
sqlite3_finalize(stmt->statement); sqlite3_finalize(stmt->statement);
stmt->statement = NULL; stmt->statement = NULL;
} }
@@ -195,7 +192,7 @@ do_open(ErlNifEnv *env, esqlite_connection *db, const ERL_NIF_TERM arg)
return error; return error;
} }
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -212,7 +209,7 @@ do_exec(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
if(rc != SQLITE_OK) if(rc != SQLITE_OK)
return make_error_tuple(env, sqlite3_errmsg(conn->db)); return make_error_tuple(env, sqlite3_errmsg(conn->db));
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -306,7 +303,7 @@ do_bind(ErlNifEnv *env, sqlite3 *db, sqlite3_stmt *stmt, const ERL_NIF_TERM arg)
list = tail; list = tail;
} }
return _atom_ok; return make_atom(env, "ok");
} }
static ERL_NIF_TERM static ERL_NIF_TERM
@@ -317,7 +314,7 @@ make_binary(ErlNifEnv *env, const void *bytes, unsigned int size)
if(!enif_alloc_binary(size, &blob)) { if(!enif_alloc_binary(size, &blob)) {
/* TODO: fix this */ /* TODO: fix this */
return _atom_error; return make_atom(env, "error");
} }
memcpy(blob.data, bytes, size); memcpy(blob.data, bytes, size);
@@ -419,7 +416,7 @@ do_close(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
return make_error_tuple(env, sqlite3_errmsg(conn->db)); return make_error_tuple(env, sqlite3_errmsg(conn->db));
conn->db = NULL; conn->db = NULL;
return _atom_ok; return make_atom(env, "ok");
} }
static ERL_NIF_TERM static ERL_NIF_TERM
@@ -550,7 +547,7 @@ esqlite_open(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!queue_push(db->commands, cmd)) if(!queue_push(db->commands, cmd))
return make_error_tuple(env, "command_push_failed"); return make_error_tuple(env, "command_push_failed");
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -588,11 +585,10 @@ esqlite_exec(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!queue_push(db->commands, cmd)) if(!queue_push(db->commands, cmd))
return make_error_tuple(env, "command_push_failed"); return make_error_tuple(env, "command_push_failed");
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
* Prepare the sql statement * Prepare the sql statement
*/ */
@@ -624,7 +620,7 @@ esqlite_prepare(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!queue_push(conn->commands, cmd)) if(!queue_push(conn->commands, cmd))
return make_error_tuple(env, "command_push_failed"); return make_error_tuple(env, "command_push_failed");
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -664,7 +660,7 @@ esqlite_bind(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!queue_push(stmt->connection->commands, cmd)) if(!queue_push(stmt->connection->commands, cmd))
return make_error_tuple(env, "command_push_failed"); return make_error_tuple(env, "command_push_failed");
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -706,7 +702,7 @@ esqlite_step(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!queue_push(stmt->connection->commands, cmd)) if(!queue_push(stmt->connection->commands, cmd))
return make_error_tuple(env, "command_push_failed"); return make_error_tuple(env, "command_push_failed");
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -748,7 +744,7 @@ esqlite_column_names(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!queue_push(stmt->connection->commands, cmd)) if(!queue_push(stmt->connection->commands, cmd))
return make_error_tuple(env, "command_push_failed"); return make_error_tuple(env, "command_push_failed");
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -782,7 +778,7 @@ esqlite_close(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!queue_push(conn->commands, cmd)) if(!queue_push(conn->commands, cmd))
return make_error_tuple(env, "command_push_failed"); return make_error_tuple(env, "command_push_failed");
return _atom_ok; return make_atom(env, "ok");
} }
/* /*
@@ -805,9 +801,6 @@ on_load(ErlNifEnv* env, void** priv, ERL_NIF_TERM info)
return -1; return -1;
esqlite_statement_type = rt; esqlite_statement_type = rt;
_atom_ok = make_atom(env, "ok");
_atom_error = make_atom(env, "error");
return 0; return 0;
} }