From 5ebbe71a1abf6e7d425479b23445242ef8ee6b98 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 ++-- bacula/src/win32/cats/bacula_cats.def | 12 +++++++++++- 6 files changed, 17 insertions(+), 7 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++; diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def index 16e77aece7..e723105fdf 100644 --- a/bacula/src/win32/cats/bacula_cats.def +++ b/bacula/src/win32/cats/bacula_cats.def @@ -27,6 +27,7 @@ _Z10_db_unlockPKciP4B_DB _Z11db_strerrorP4B_DB _Z11list_dashesP4B_DBPFvPvPKcES1_ _Z11list_resultP3JCRP4B_DBPFvPvPKcES3_11e_list_type +_Z14db_debug_printP3JCRP6_iobuf _Z16db_int64_handlerPviPPc _Z15db_list_handlerPviPPc _Z18db_end_transactionP3JCRP4B_DB @@ -35,6 +36,7 @@ _Z19split_path_and_fileP3JCRP4B_DBPKc _Z20check_tables_versionP3JCRP4B_DB _Z20db_start_transactionP3JCRP4B_DB _Z23db_open_batch_connexionP3JCRP4B_DB +_Z24db_check_max_connectionsP3JCRP4B_DBj _Z7db_initP3JCRPKcS2_S2_S2_S2_iS2_i _Z7QueryDBPKciP3JCRP4B_DBPc _Z8DeleteDBPKciP3JCRP4B_DBPc @@ -45,7 +47,6 @@ _ZN9dbid_listC1Ev _ZN9dbid_listC2Ev _ZN9dbid_listD1Ev _ZN9dbid_listD2Ev -_Z13_dbg_print_dbP3JCRP6_iobuf ; sql_create.o _Z20db_create_job_recordP3JCRP4B_DBP7JOB_DBR @@ -53,13 +54,17 @@ _Z21db_create_pool_recordP3JCRP4B_DBP8POOL_DBR _Z22db_create_media_recordP3JCRP4B_DBP9MEDIA_DBR _Z23db_create_client_recordP3JCRP4B_DBP10CLIENT_DBR _Z23db_create_device_recordP3JCRP4B_DBP10DEVICE_DBR +_Z24db_create_base_file_listP3JCRP4B_DBPc _Z24db_create_counter_recordP3JCRP4B_DBP11COUNTER_DBR _Z24db_create_fileset_recordP3JCRP4B_DBP11FILESET_DBR _Z24db_create_storage_recordP3JCRP4B_DBP11STORAGE_DBR _Z25db_create_jobmedia_recordP3JCRP4B_DBP12JOBMEDIA_DBR _Z26db_create_mediatype_recordP3JCRP4B_DBP13MEDIATYPE_DBR +_Z27db_create_attributes_recordP3JCRP4B_DBP8ATTR_DBR _Z27db_write_batch_file_recordsP3JCR _Z32db_create_file_attributes_recordP3JCRP4B_DBP8ATTR_DBR +_Z37db_commit_base_file_attributes_recordP3JCRP4B_DB +_Z37db_create_base_file_attributes_recordP3JCRP4B_DBP8ATTR_DBR ; sql_delete.o _Z21db_delete_pool_recordP3JCRP4B_DBP8POOL_DBR @@ -77,17 +82,20 @@ _Z27db_find_last_job_start_timeP3JCRP4B_DBP7JOB_DBRPPci _Z15db_get_pool_idsP3JCRP4B_DBPiPPj _Z16db_get_file_listP3JCRP4B_DBPcPFiPviPS3_ES4_ _Z16db_get_media_idsP3JCRP4B_DBP9MEDIA_DBRPiPPj +_Z17db_get_base_jobidP3JCRP4B_DBP7JOB_DBRPj _Z17db_get_client_idsP3JCRP4B_DBPiPPj _Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR _Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR _Z18db_get_query_dbidsP3JCRP4B_DBR8POOL_MEMR9dbid_list _Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR _Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR +_Z21db_get_base_file_listP3JCRP4B_DBPFiPviPPcES3_ _Z21db_get_counter_recordP3JCRP4B_DBP11COUNTER_DBR _Z21db_get_fileset_recordP3JCRP4B_DBP11FILESET_DBR _Z22db_accurate_get_jobidsP3JCRP4B_DBP7JOB_DBRP11db_list_ctx _Z23db_get_job_volume_namesP3JCRP4B_DBjPPc _Z23db_get_num_pool_recordsP3JCRP4B_DB +_Z23db_get_used_base_jobidsP3JCRP4B_DBPcP11db_list_ctx _Z24db_get_num_media_recordsP3JCRP4B_DB _Z28db_get_job_volume_parametersP3JCRP4B_DBjPP10VOL_PARAMS _Z29db_get_file_attributes_recordP3JCRP4B_DBPcP7JOB_DBRP8FILE_DBR @@ -103,6 +111,7 @@ _Z21db_list_media_recordsP3JCRP4B_DBP9MEDIA_DBRPFvPvPKcES5_11e_list_type _Z22db_list_client_recordsP3JCRP4B_DBPFvPvPKcES3_11e_list_type _Z22db_list_joblog_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type _Z24db_list_jobmedia_recordsP3JCRP4B_DBjPFvPvPKcES3_11e_list_type +_Z26db_list_base_files_for_jobP3JCRP4B_DBjPFvPvPKcES3_ ; sql_update.o _Z15db_update_statsP3JCRP4B_DBx @@ -150,6 +159,7 @@ cnt_JobMedia DATA sel_JobMedia DATA upd_Purged DATA uar_list_jobs DATA +uar_print_jobs DATA uar_file DATA uar_count_files DATA uar_sel_files DATA -- 2.39.5