R/rmodb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove dependency on mysql.h in header file

Browse Source
This commit is contained in:
Craig Williams
2020-09-08 13:58:47 +01:00
parent 8729642387
commit ea3d3e4c11
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/database.c
View File

@@ -6,6 +6,8 @@
#include "database.h" #include "database.h"
#define SQCONN(s) (MYSQL *)s->conn
struct stored_conn_t *storedConnections = 0; struct stored_conn_t *storedConnections = 0;
int nextConnId = 1; int nextConnId = 1;
@@ -83,7 +85,7 @@ struct stored_conn_t *createStoredConnection(const char *name)
memcpy(sconn->name, name, strlen(name) * sizeof(char)); memcpy(sconn->name, name, strlen(name) * sizeof(char));
} }
if (mysql_init(sconn->conn) == 0) { if (mysql_init(SQCONN(sconn)) == 0) {
fprintf(stderr, "mysql_init: unknown error\n"); fprintf(stderr, "mysql_init: unknown error\n");
destroyStoredConnection(sconn); destroyStoredConnection(sconn);
return 0; return 0;
@@ -139,7 +141,7 @@ void destroyStoredConnection(struct stored_conn_t *sconn)
} }
if (sconn->isOpen) { if (sconn->isOpen) {
mysql_close(sconn->conn); mysql_close(SQCONN(sconn));
} }
if (sconn->name) { if (sconn->name) {
@@ -197,13 +199,13 @@ int setTimeout(struct stored_conn_t *sconn, unsigned int timeout)
{ {
sconn->timeout = timeout; sconn->timeout = timeout;
if (mysql_optionsv(sconn->conn, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&timeout) != 0) { if (mysql_optionsv(SQCONN(sconn), MYSQL_OPT_CONNECT_TIMEOUT, (void *)&timeout) != 0) {
return -1; return -1;
} }
if (mysql_optionsv(sconn->conn, MYSQL_OPT_READ_TIMEOUT, (void *)&timeout) != 0) { if (mysql_optionsv(SQCONN(sconn), MYSQL_OPT_READ_TIMEOUT, (void *)&timeout) != 0) {
return -1; return -1;
} }
if (mysql_optionsv(sconn->conn, MYSQL_OPT_WRITE_TIMEOUT, (void *)&timeout) != 0) { if (mysql_optionsv(SQCONN(sconn), MYSQL_OPT_WRITE_TIMEOUT, (void *)&timeout) != 0) {
return -1; return -1;
} }
@@ -239,15 +241,15 @@ int connectToHost(struct stored_conn_t *sconn,
return -1; return -1;
} }
ret = mysql_real_connect(sconn->conn, host, user, passwd, db, port, NULL, 0); ret = mysql_real_connect(SQCONN(sconn), host, user, passwd, db, port, NULL, 0);
// flags: CLIENT_MULTI_STATEMENTS // flags: CLIENT_MULTI_STATEMENTS
if (ret == 0) { if (ret == 0) {
fprintf( fprintf(
stderr, "mysql_real_connect: (%d) %s\n", mysql_errno(sconn->conn), mysql_error(sconn->conn) stderr, "mysql_real_connect: (%d) %s\n", mysql_errno(SQCONN(sconn)), mysql_error(SQCONN(sconn))
); );
sconn->needsReset = 1; sconn->needsReset = 1;
errno = -mysql_errno(sconn->conn); errno = -mysql_errno(SQCONN(sconn));
if (freeCon) { if (freeCon) {
destroyStoredConnection(sconn); destroyStoredConnection(sconn);
} }
@@ -282,15 +284,15 @@ int connectToSocket(struct stored_conn_t *sconn,
return -1; return -1;
} }
ret = mysql_real_connect(sconn->conn, NULL, user, passwd, db, 0, unix_socket, 0); ret = mysql_real_connect(SQCONN(sconn), NULL, user, passwd, db, 0, unix_socket, 0);
// flags: CLIENT_MULTI_STATEMENTS // flags: CLIENT_MULTI_STATEMENTS
if (ret == 0) { if (ret == 0) {
fprintf( fprintf(
stderr, "mysql_real_connect: (%d) %s\n", mysql_errno(sconn->conn), mysql_error(sconn->conn) stderr, "mysql_real_connect: (%d) %s\n", mysql_errno(SQCONN(sconn)), mysql_error(SQCONN(sconn))
); );
sconn->needsReset = 1; sconn->needsReset = 1;
errno = -mysql_errno(sconn->conn); errno = -mysql_errno(SQCONN(sconn));
if (freeCon) { if (freeCon) {
destroyStoredConnection(sconn); destroyStoredConnection(sconn);
} }
@@ -309,7 +311,7 @@ void closeConnection(struct stored_conn_t *sconn)
} }
if (sconn->isOpen) { if (sconn->isOpen) {
mysql_close(sconn->conn); mysql_close(SQCONN(sconn));
} }
sconn->needsReset = 1; sconn->needsReset = 1;

3
src/database.h
View File

@@ -1,13 +1,12 @@
#ifndef __DATABASE_H__ #ifndef __DATABASE_H__
#define __DATABASE_H__ #define __DATABASE_H__
#include <mysql.h>
struct stored_conn_t { struct stored_conn_t {
int conn_id; int conn_id;
char *name; char *name;
MYSQL *conn; void *conn;
int isOpen :1; int isOpen :1;
int isTransact :1; int isTransact :1;