From 313f03013ba4edbf6352ed9005fe16e49f61dc33 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 17 Nov 2004 22:48:23 +0000
Subject: [PATCH] Bring 1.36.0 up to current 1.37 level

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1701 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/Makefile.in  |  2 +-
 bacula/src/cats/bdb.c        | 10 +++++-----
 bacula/src/cats/bdb_create.c |  2 +-
 bacula/src/cats/bdb_update.c |  2 +-
 bacula/src/cats/sql_update.c |  9 +++++++++
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 3372a51725..b33dc09f52 100644
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -79,7 +79,7 @@ realclean: clean
 	$(RMF) create_sqlite_database	   update_sqlite_tables     make_sqlite_tables
 	$(RMF) grant_sqlite_privileges	   drop_sqlite_tables	    drop_sqlite_database
 
-	$(RMF) mysql sqlite
+	$(RMF) mysql sqlite postgresql
 	$(RMF) make_catalog_backup delete_catalog_backup
 
 distclean: realclean
diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c
index 16c793e2b3..1cf8c3a05b 100644
--- a/bacula/src/cats/bdb.c
+++ b/bacula/src/cats/bdb.c
@@ -102,8 +102,8 @@ int bdb_write_control_file(B_DB *mdb)
  * never have errors, or it is really fatal.
  */
 B_DB *
-db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
-		 char *db_address, int db_port, char *db_socket, 
+db_init_database(JCR *jcr, char const *db_name, char const *db_user, char const *db_password,
+		 char const *db_address, int db_port, char const *db_socket, 
 		 int mult_db_connections)
 {
    B_DB *mdb;
@@ -289,7 +289,7 @@ char *db_strerror(B_DB *mdb)
    return mdb->errmsg;
 }
 
-int db_sql_query(B_DB *mdb, char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+int db_sql_query(B_DB *mdb, char const *query, DB_RESULT_HANDLER *result_handler, void *ctx)
 {
    return 1;
 }
@@ -430,7 +430,7 @@ int bdb_open_media_file(B_DB *mdb)
 }
 
 
-void _db_lock(char *file, int line, B_DB *mdb)
+void _db_lock(const char *file, int line, B_DB *mdb)
 {
    int errstat;
    if ((errstat=rwl_writelock(&mdb->lock)) != 0) {
@@ -439,7 +439,7 @@ void _db_lock(char *file, int line, B_DB *mdb)
    }
 }    
 
-void _db_unlock(char *file, int line, B_DB *mdb)
+void _db_unlock(const char *file, int line, B_DB *mdb)
 {
    int errstat;
    if ((errstat=rwl_writeunlock(&mdb->lock)) != 0) {
diff --git a/bacula/src/cats/bdb_create.c b/bacula/src/cats/bdb_create.c
index 20468b33e4..a42c4a422a 100644
--- a/bacula/src/cats/bdb_create.c
+++ b/bacula/src/cats/bdb_create.c
@@ -105,7 +105,7 @@ int db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
  * Returns: 0 on failure
  *	    record-id on success
  */
-int db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
+bool db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
 {
    int len;
 
diff --git a/bacula/src/cats/bdb_update.c b/bacula/src/cats/bdb_update.c
index f50a1c8e31..3728613543 100755
--- a/bacula/src/cats/bdb_update.c
+++ b/bacula/src/cats/bdb_update.c
@@ -111,7 +111,7 @@ int db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 
    fseek(mdb->jobfd, ojr.rec_addr, SEEK_SET);
    if (fwrite(jr, len, 1, mdb->jobfd) != 1) {
-      Mmsg1(&db->errmsg, _("Error updating DB Job file. ERR=%s\n"), strerror(errno));
+      Mmsg1(&mdb->errmsg, _("Error updating DB Job file. ERR=%s\n"), strerror(errno));
       stat = 0;
    }
    fflush(mdb->jobfd);
diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 14f9c93bd2..48dfb254ef 100644
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -395,4 +395,13 @@ db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
    }
 }
 
+#else
+
+void
+db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
+{
+  /* DUMMY func for Bacula_DB */
+  return;
+}
+
 #endif /* HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL*/
-- 
2.39.5