create_table_wrapper does not need callback

Author: calccrypto

include/dbutils.h

@@ -94,7 +94,7 @@ sqlite3 *attachdb(const char *name, sqlite3 *db, const char *dbn, const int flag
 
 sqlite3 *detachdb(const char *name, sqlite3 *db, const char *dbn);
 
-int create_table_wrapper(const char *name, sqlite3 *db, const char *sql_name, const char *sql, int (*callback)(void*,int,char**,char**), void *args);
+int create_table_wrapper(const char *name, sqlite3 *db, const char *sql_name, const char *sql);
 
 int set_db_pragmas(sqlite3 *db);
 

src/bfti.c

@@ -90,10 +90,10 @@ extern int errno;
 
 static int create_tables(const char *name, sqlite3 *db, void * args) {
      printf("writetsum %d\n", in.writetsum);
-    if ((create_table_wrapper(name, db, "tsql",        tsql,        NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vtssqldir",   vtssqldir,   NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vtssqluser",  vtssqluser,  NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vtssqlgroup", vtssqlgroup, NULL, NULL) != SQLITE_OK)) {
+    if ((create_table_wrapper(name, db, "tsql",        tsql)        != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vtssqldir",   vtssqldir)   != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vtssqluser",  vtssqluser)  != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vtssqlgroup", vtssqlgroup) != SQLITE_OK)) {
         return -1;
     }
 

src/bfwreaddirplus2db.c

@@ -131,20 +131,20 @@ int searchmyll(long long int lull, int lutype) {
 }
 
 static int create_tables(const char * name, sqlite3 * db, void * args) {
-    if ((create_table_wrapper(name, db, "esql",        esql,        NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "ssql",        ssql,        NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vssqldir",    vssqldir,    NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vssqluser",   vssqluser,   NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vssqlgroup",  vssqlgroup,  NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vesql",       vesql,       NULL, NULL) != SQLITE_OK)) {
+    if ((create_table_wrapper(name, db, "esql",        esql)       != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "ssql",        ssql)       != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vssqldir",    vssqldir)   != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vssqluser",   vssqluser)  != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vssqlgroup",  vssqlgroup) != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vesql",       vesql)      != SQLITE_OK)) {
         return -1;
     }
 
     return 0;
 }
 
 static int create_readdirplus_tables(const char * name, sqlite3 * db, void * args) {
-    if (create_table_wrapper(name, db, "rsql",         rsql,        NULL, NULL) != SQLITE_OK) {
+    if (create_table_wrapper(name, db, "rsql",         rsql)       != SQLITE_OK) {
         return -1;
     }
 

src/dbutils.c

@@ -155,9 +155,9 @@ sqlite3 *detachdb(const char *name, sqlite3 *db, const char *dbn)
   return db;
 }
 
-int create_table_wrapper(const char *name, sqlite3 *db, const char *sql_name, const char *sql, int (*callback)(void*,int,char**,char**), void *args) {
+int create_table_wrapper(const char *name, sqlite3 *db, const char *sql_name, const char *sql) {
     char *err_msg = NULL;
-    const int rc = sqlite3_exec(db, sql, callback, args, &err_msg);
+    const int rc = sqlite3_exec(db, sql, NULL, NULL, &err_msg);
     if (rc != SQLITE_OK) {
         fprintf(stderr, "%s:%d SQL error while executing '%s' on %s: '%s' (%d)\n",
                 __FILE__, __LINE__, sql_name, name, err_msg, rc);

src/template_db.c

@@ -96,12 +96,12 @@ static ssize_t gufi_copyfd(int src_fd, int dst_fd, size_t size) {
 extern int errno;
 
 static int create_tables(const char *name, sqlite3 *db, void *args) {
-    if ((create_table_wrapper(name, db, "esql",        esql,        NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "ssql",        ssql,        NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vssqldir",    vssqldir,    NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vssqluser",   vssqluser,   NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vssqlgroup",  vssqlgroup,  NULL, NULL) != SQLITE_OK) ||
-        (create_table_wrapper(name, db, "vesql",       vesql,       NULL, NULL) != SQLITE_OK)) {
+    if ((create_table_wrapper(name, db, "esql",        esql)       != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "ssql",        ssql)       != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vssqldir",    vssqldir)   != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vssqluser",   vssqluser)  != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vssqlgroup",  vssqlgroup) != SQLITE_OK) ||
+        (create_table_wrapper(name, db, "vesql",       vesql)      != SQLITE_OK)) {
         return -1;
     }