From 12db8ea12c9837db64079318f9f288db2173515c Mon Sep 17 00:00:00 2001
From: avsdev-cw <craig@avsdev.uk>
Date: Wed, 7 Oct 2020 11:40:06 +0100
Subject: [PATCH] Renamed WhereBuilder destroyer to free

---
 src/db_query.c           | 15 +++++++++------
 src/db_where-builder.c   |  2 +-
 src/db_where-builder.h   |  2 +-
 src/db_where-builder_p.c | 14 +++++++-------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/db_query.c b/src/db_query.c
index 0356d07..919913d 100644
--- a/src/db_query.c
+++ b/src/db_query.c
@@ -286,10 +286,10 @@ int64_t countQuery(struct stored_conn_t *sconn, const char *table, where_builder
   strbld_str(sb, "` WHERE ", 0);
   compileWhereBuilder_sb(wb, sb);
   if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) {
-    destroyWhereBuilder(&wb);
+    freeWhereBuilder(&wb);
     return -1;
   }
-  destroyWhereBuilder(&wb);
+  freeWhereBuilder(&wb);
 
   qry_ret = scalarInt(sconn, qry, qry_len, 0);
   free(qry);
@@ -340,7 +340,7 @@ int syncIdMap(struct stored_conn_t *sconn, const char *table,
 
   wb = where(0, primary_col, EQ, TYPE_ID, 1, primary_id);
   qry_ret = deleteQuery(sconn, table, wb);
-  destroyWhereBuilder(&wb);
+  freeWhereBuilder(&wb);
 
   if (qry_ret != 1) {
     return qry_ret;
@@ -371,8 +371,11 @@ int syncIdMap(struct stored_conn_t *sconn, const char *table,
   }
 
   if (simpleQuery(sconn, qry, qry_len) == (uint64_t)-1) {
-    return -1;
+    qry_ret = -1;
+  } else {
+    qry_ret = 1;
   }
+  free(qry);
 
   return 1;
 }
@@ -411,7 +414,7 @@ int hasIdMap(struct stored_conn_t *sconn, const char *table,
         where(table, map_col, EQ, TYPE_ID, 1, map_id)
         );
   qry_ret = countQuery(sconn, table, wb);
-  destroyWhereBuilder(&wb);
+  freeWhereBuilder(&wb);
 
   return qry_ret > 0;
 }
@@ -468,7 +471,7 @@ int removeIdMap(struct stored_conn_t *sconn, const char *table,
         where(0, map_col, EQ, TYPE_ID, 1, map_id)
         );
   qry_ret = deleteQuery(sconn, table, wb);
-  destroyWhereBuilder(&wb);
+  freeWhereBuilder(&wb);
 
   return qry_ret;
 }
diff --git a/src/db_where-builder.c b/src/db_where-builder.c
index a447646..85754bd 100644
--- a/src/db_where-builder.c
+++ b/src/db_where-builder.c
@@ -56,7 +56,7 @@ void compileWhereBuilder_sb(where_builder *wb, str_builder *sb)
     }
   }
 }
-void destroyWhereBuilder(where_builder **wb_ptr)
+void freeWhereBuilder(where_builder **wb_ptr)
 {
   where_builder *wb = finalizeWhere(*wb_ptr);
 
diff --git a/src/db_where-builder.h b/src/db_where-builder.h
index 43ed1cd..4d18dec 100644
--- a/src/db_where-builder.h
+++ b/src/db_where-builder.h
@@ -42,7 +42,7 @@ typedef struct where_builder_t where_builder;
 where_builder *createWhereBuilder(where_builder *initial_clause);
 int compileWhereBuilder(where_builder *wb, char **str, size_t *str_len);
 void compileWhereBuilder_sb(where_builder *wb, str_builder *sb);
-void destroyWhereBuilder(where_builder **wb_ptr);
+void freeWhereBuilder(where_builder **wb_ptr);
 
 
 where_builder *where(const char *tbl, const char *col, e_where_op op, e_column_type type,
diff --git a/src/db_where-builder_p.c b/src/db_where-builder_p.c
index e5888c9..caff4a4 100644
--- a/src/db_where-builder_p.c
+++ b/src/db_where-builder_p.c
@@ -72,7 +72,7 @@ void freeLogic(where_logic **logic_ptr)
   while (logic->n_clauses > 0) {
     construct = logic->clauses[logic->n_clauses - 1];
     construct->up = 0;
-    destroyWhereBuilder(&construct);
+    freeWhereBuilder(&construct);
     logic->n_clauses--;
   }
   if (logic->clauses != 0) {
@@ -310,7 +310,7 @@ where_builder *where_And_Or(where_builder *wb, where_builder *wb_clause, e_where
     case UNK:
     {
       if ((logic = createLogic(and_or, 2)) == 0) {
-        destroyWhereBuilder(&wb_clause);
+        freeWhereBuilder(&wb_clause);
         return wb;
       }
       free(wb);
@@ -326,7 +326,7 @@ where_builder *where_And_Or(where_builder *wb, where_builder *wb_clause, e_where
     case CLAUSE:
     {
       if ((logic = createLogic(and_or, 2)) == 0) {
-        destroyWhereBuilder(&wb_clause);
+        freeWhereBuilder(&wb_clause);
         return wb;
       }
       logic->clauses[0] = wb;
@@ -345,12 +345,12 @@ where_builder *where_And_Or(where_builder *wb, where_builder *wb_clause, e_where
     {
       if (and_or == AND) {
         if ((logic = createLogic(AND, 2)) == 0) {
-          destroyWhereBuilder(&wb_clause);
+          freeWhereBuilder(&wb_clause);
           return wb;
         }
         if (whereOr(wb, (where_builder *)logic) == 0) {
           freeLogic(&logic);
-          destroyWhereBuilder(&wb_clause);
+          freeWhereBuilder(&wb_clause);
           return wb;
         }
         wb = appendLogicClause((where_builder *)logic, wb_clause);
@@ -366,12 +366,12 @@ where_builder *where_And_Or(where_builder *wb, where_builder *wb_clause, e_where
         wb = appendLogicClause(wb, wb_clause);
       } else {
         if ((logic = createLogic(OR, 2)) == 0) {
-          destroyWhereBuilder(&wb_clause);
+          freeWhereBuilder(&wb_clause);
           return wb;
         }
         if (whereAnd(wb, (where_builder *)logic) == 0) {
           freeLogic(&logic);
-          destroyWhereBuilder(&wb_clause);
+          freeWhereBuilder(&wb_clause);
           return wb;
         }
         wb = appendLogicClause((where_builder *)logic, wb_clause);