From 69340c25e82eed6b92a8ab7d833f624e635651c7 Mon Sep 17 00:00:00 2001
From: avsdev-cw <craig@avsdev.uk>
Date: Tue, 15 Sep 2020 15:00:58 +0100
Subject: [PATCH] Some minor modifications to database files

---
 src/database.c      |  4 ++--
 src/database.h      |  2 +-
 src/db_connection.h |  7 ++++---
 src/db_query.c      | 10 ++++++++--
 src/db_query.h      |  2 +-
 src/db_timeout.c    |  4 ++--
 src/db_timeout.h    |  8 ++++----
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/database.c b/src/database.c
index 9be0a74..60a941e 100644
--- a/src/database.c
+++ b/src/database.c
@@ -6,5 +6,5 @@ void sessionEnd()
 {
   destroyAllConnections();
   mysql_library_end();
-  setDefaultTimeout(-1);
-}
\ No newline at end of file
+  setDefaultTimeout((unsigned int)-1);
+}
diff --git a/src/database.h b/src/database.h
index c821819..64f7056 100644
--- a/src/database.h
+++ b/src/database.h
@@ -7,6 +7,6 @@
 #include "db_column.h"
 #include "db_query.h"
 
-void sessionEnd();
+void sessionEnd(void);
 
 #endif // H__DATABASE__
diff --git a/src/db_connection.h b/src/db_connection.h
index 7313630..c1be7e1 100644
--- a/src/db_connection.h
+++ b/src/db_connection.h
@@ -2,6 +2,7 @@
 #define H__DB_CONNECTION__
 
 #include <stdint.h>
+#include <stdlib.h>
 
 #define SQCONN(s) (MYSQL *)s->conn
 
@@ -27,13 +28,13 @@ struct stored_conn_t {
 struct stored_conn_t *connectionById(int conn_id);
 struct stored_conn_t *connectionByName(const char *name);
 
-int connectionCount();
+int connectionCount(void);
 
 // Connection management
 struct stored_conn_t *createStoredConnection(const char *name);
 struct stored_conn_t *resetStoredConnection(struct stored_conn_t *sconn);
 void destroyStoredConnection(struct stored_conn_t *sconn);
-void destroyAllConnections();
+void destroyAllConnections(void);
 
 int connectToHost(struct stored_conn_t *sconn,
                   const char *host, unsigned int port,
@@ -42,6 +43,6 @@ int connectToSocket(struct stored_conn_t *sconn,
                     const char *unix_socket,
                     const char *user, const char *passwd, const char *db);
 void closeConnection(struct stored_conn_t *sconn);
-void closeAllConnections();
+void closeAllConnections(void);
 
 #endif // H__DB_CONNECTION__
diff --git a/src/db_query.c b/src/db_query.c
index 0c86e1d..df58cff 100644
--- a/src/db_query.c
+++ b/src/db_query.c
@@ -57,12 +57,18 @@ uint64_t scalarQuery(struct stored_conn_t *sconn, const char *qry, size_t qry_le
     return (uint64_t)-1;
   }
   if (n_row > 1) {
-    fprintf(stderr, "[%d]scalarQuery: WARN: Too many rows in result, only returning first value\n", __LINE__);
+    fprintf(
+      stderr, "[%d]scalarQuery: WARN: Too many rows in result, only returning first value\n",
+      __LINE__
+    );
   }
 
   n_col = mysql_num_fields(result);
   if (n_col > 1) {
-    fprintf(stderr, "[%d]scalarQuery: WARN: Too many columns in result, only returning first value\n", __LINE__);
+    fprintf(
+      stderr, "[%d]scalarQuery: WARN: Too many columns in result, only returning first value\n",
+      __LINE__
+    );
   }
 
   row = mysql_fetch_row(result);
diff --git a/src/db_query.h b/src/db_query.h
index 844c4dc..844ed6f 100644
--- a/src/db_query.h
+++ b/src/db_query.h
@@ -1,8 +1,8 @@
 #ifndef H__DB_QUERY__
 #define H__DB_QUERY__
 
-#include <stdint.h>
 #include "db_connection.h"
+#include "db_column.h"
 
 // Generic query methods
 uint64_t simpleQuery(struct stored_conn_t *sconn, const char *qry, size_t qry_len);
diff --git a/src/db_timeout.c b/src/db_timeout.c
index 71e283f..e83fa44 100644
--- a/src/db_timeout.c
+++ b/src/db_timeout.c
@@ -3,7 +3,7 @@
 #include "db_timeout.h"
 
 
-int defaultTimeout = -1;
+static unsigned int defaultTimeout = (unsigned int)-1;
 
 
 void setDefaultTimeout(unsigned int timeout)
@@ -30,4 +30,4 @@ int setTimeout(struct stored_conn_t *sconn, unsigned int timeout)
   }
 
   return 0;
-}
\ No newline at end of file
+}
diff --git a/src/db_timeout.h b/src/db_timeout.h
index 7781556..61eb2fa 100644
--- a/src/db_timeout.h
+++ b/src/db_timeout.h
@@ -1,12 +1,12 @@
-#ifndef __DB_TIMEOUT_H__
-#define __DB_TIMEOUT_H__
+#ifndef H__DB_TIMEOUT__
+#define H__DB_TIMEOUT__
 
 #include "db_connection.h"
 
 // Timeouts can either be set globally or on a per-connection basis
 void setDefaultTimeout(unsigned int timeout);
-unsigned int getDefaultTimeout();
+unsigned int getDefaultTimeout(void);
 
 int setTimeout(struct stored_conn_t *sconn, unsigned int timeout);
 
-#endif // __DB_TIMEOUT_H__
\ No newline at end of file
+#endif // H__DB_TIMEOUT__