From 4563a6d3af81d2d67c8b5423ce468f33c39d71b3 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 5 Dec 2009 17:06:11 +0100 Subject: [PATCH] Fix Win32 build after adding Base Job code --- bacula/src/cats/cats.h | 2 +- bacula/src/cats/protos.h | 2 +- bacula/src/cats/sql.c | 2 +- bacula/src/cats/sql_get.c | 2 +- bacula/src/dird/dird.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h index d252def605..8c0d4f90c4 100644 --- a/bacula/src/cats/cats.h +++ b/bacula/src/cats/cats.h @@ -1072,7 +1072,7 @@ private: /* * Exported globals from sql.c */ -extern int DLL_IMP_EXP db_type; /* SQL engine type index */ +extern int CATS_IMP_EXP db_type; /* SQL engine type index */ /* * Some functions exported by sql.c for use within the diff --git a/bacula/src/cats/protos.h b/bacula/src/cats/protos.h index 7f73c7b092..4d24db65c3 100644 --- a/bacula/src/cats/protos.h +++ b/bacula/src/cats/protos.h @@ -59,7 +59,7 @@ void db_end_transaction(JCR *jcr, B_DB *mdb); int db_int64_handler(void *ctx, int num_fields, char **row); int db_list_handler(void *ctx, int num_fields, char **row); void db_thread_cleanup(); -void dbg_print_db(JCR *jcr, FILE *fp); +void db_debug_print(JCR *jcr, FILE *fp); int db_int_handler(void *ctx, int num_fields, char **row); /* sql_create.c */ diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c index 8421962315..8c875cfc4f 100644 --- a/bacula/src/cats/sql.c +++ b/bacula/src/cats/sql.c @@ -826,7 +826,7 @@ bool db_open_batch_connexion(JCR *jcr, B_DB *mdb) * ie, after a fatal signal and before exiting the program * Print information about a B_DB object. */ -void dbg_print_db(JCR *jcr, FILE *fp) +void db_debug_print(JCR *jcr, FILE *fp) { B_DB *mdb = jcr->db; diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c index 56bc5ac1e9..3147b3a73c 100644 --- a/bacula/src/cats/sql_get.c +++ b/bacula/src/cats/sql_get.c @@ -116,7 +116,7 @@ int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr) int stat = 0; char ed1[50], ed2[50], ed3[50]; - if (jcr->get_JobLevel() == L_VERIFY_DISK_TO_CATALOG) { + if (jcr->getJobLevel() == L_VERIFY_DISK_TO_CATALOG) { Mmsg(mdb->cmd, "SELECT FileId, LStat, MD5 FROM File,Job WHERE " "File.JobId=Job.JobId AND File.PathId=%s AND " diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c index 2e3a4c7ce0..9c36130ea5 100644 --- a/bacula/src/dird/dird.c +++ b/bacula/src/dird/dird.c @@ -329,7 +329,7 @@ int main (int argc, char *argv[]) init_job_server(director->MaxConcurrentJobs); - dbg_jcr_add_hook(dbg_print_db); /* used to debug B_DB connexion after fatal signal */ + dbg_jcr_add_hook(db_debug_print); /* used to debug B_DB connexion after fatal signal */ // init_device_resources(); @@ -552,7 +552,7 @@ void reload_config(int sig) * Hook all active jobs so that they release this table */ foreach_jcr(jcr) { - if (jcr->get_JobType() != JT_SYSTEM) { + if (jcr->getJobType() != JT_SYSTEM) { reload_table[table].job_count++; job_end_push(jcr, reload_job_end_cb, (void *)((long int)table)); njobs++; -- 2.39.5