From 1d4bb7bdb939eccb82b82cd8e066a94dc2529052 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 19 May 2008 17:13:29 +0000 Subject: [PATCH] Fix cats dll build on Win32 after db_update_job_end_record calling sequence change git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6990 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/bdb.c | 2 +- bacula/src/cats/bdb_update.c | 4 ++-- bacula/src/win32/cats/bacula_cats.def | 2 +- bacula/technotes-2.3 | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c index f52cc74899..2544192f16 100644 --- a/bacula/src/cats/bdb.c +++ b/bacula/src/cats/bdb.c @@ -742,7 +742,7 @@ bool db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) * This is called at Job termination time to add all the * other fields to the job record. */ -int db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) +int db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, bool stats_enabled) { return 0; } diff --git a/bacula/src/cats/bdb_update.c b/bacula/src/cats/bdb_update.c index 21aa1f24c3..a9c0e530ef 100644 --- a/bacula/src/cats/bdb_update.c +++ b/bacula/src/cats/bdb_update.c @@ -16,7 +16,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2001-2006 Free Software Foundation Europe e.V. + Copyright (C) 2001-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -75,7 +75,7 @@ bool db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) * This is called at Job termination time to add all the * other fields to the job record. */ -int db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) +int db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, bool stats_enabled) { return 0; } diff --git a/bacula/src/win32/cats/bacula_cats.def b/bacula/src/win32/cats/bacula_cats.def index 704facdb48..77d73368a2 100644 --- a/bacula/src/win32/cats/bacula_cats.def +++ b/bacula/src/win32/cats/bacula_cats.def @@ -86,7 +86,7 @@ _Z22db_update_media_recordP3JCRP4B_DBP9MEDIA_DBR _Z23db_update_client_recordP3JCRP4B_DBP10CLIENT_DBR _Z24db_make_inchanger_uniqueP3JCRP4B_DBP9MEDIA_DBR _Z24db_update_counter_recordP3JCRP4B_DBP11COUNTER_DBR -_Z24db_update_job_end_recordP3JCRP4B_DBP7JOB_DBR +_Z24db_update_job_end_recordP3JCRP4B_DBP7JOB_DBRb _Z24db_update_media_defaultsP3JCRP4B_DBP9MEDIA_DBR _Z24db_update_storage_recordP3JCRP4B_DBP11STORAGE_DBR _Z26db_update_job_start_recordP3JCRP4B_DBP7JOB_DBR diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3 index 62ac12528d..b5d549ff8a 100644 --- a/bacula/technotes-2.3 +++ b/bacula/technotes-2.3 @@ -25,6 +25,8 @@ Add long term statistics job table General: 19May08 +kes Fix cats dll build on Win32 after db_update_job_end_record + calling sequence change. ebl Switch to tokyo dbm instead of htable in accurate code ebl Include tokyo dbm to bacula source tree 17May08 -- 2.39.5