From f708e46ebcf8c1bf319bc51857013d580d50ca33 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 17 Jan 2003 10:20:50 +0000
Subject: [PATCH] Update bdb calling sequence

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@301 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/cats/bdb_create.c | 26 +++++++++++++-------------
 bacula/src/cats/bdb_delete.c | 10 +++++-----
 bacula/src/cats/bdb_find.c   |  9 ++++-----
 bacula/src/cats/bdb_get.c    | 28 +++++++++++++---------------
 bacula/src/cats/bdb_list.c   | 24 ++++++++++++++----------
 bacula/src/cats/bdb_update.c | 22 +++++++++++-----------
 6 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/bacula/src/cats/bdb_create.c b/bacula/src/cats/bdb_create.c
index 713e2486dd..1c4e319058 100644
--- a/bacula/src/cats/bdb_create.c
+++ b/bacula/src/cats/bdb_create.c
@@ -14,7 +14,7 @@
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -55,13 +55,13 @@ int db_create_pool_record(B_DB *mdb, POOL_DBR *pr);
  * -----------------------------------------------------------------------
  */
 
-int db_create_file_attributes_record(B_DB *mdb, ATTR_DBR *ar)
+int db_create_file_attributes_record(void *jcr, B_DB *mdb, ATTR_DBR *ar)
 {
    /* *****FIXME***** implement this */
    return 1;
 }
 
-int db_create_file_item(B_DB *mdb, ATTR_DBR *ar)
+int db_create_file_item(void *jcr, B_DB *mdb, ATTR_DBR *ar)
 {	     
    /****FIXME***** not implemented */
    return 1;
@@ -76,7 +76,7 @@ int db_create_file_item(B_DB *mdb, ATTR_DBR *ar)
  * Returns: 0 on failure
  *	    1 on success
  */
-int db_create_job_record(B_DB *mdb, JOB_DBR *jr)
+int db_create_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
 {
    int len;
 
@@ -105,7 +105,7 @@ int db_create_job_record(B_DB *mdb, JOB_DBR *jr)
  * Returns: 0 on failure
  *	    record-id on success
  */
-int db_create_jobmedia_record(B_DB *mdb, JOBMEDIA_DBR *jm)
+int db_create_jobmedia_record(void *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
 {
    int len;
 
@@ -137,14 +137,14 @@ int db_create_jobmedia_record(B_DB *mdb, JOBMEDIA_DBR *jm)
  * Returns: 0 on failure
  *	    1 on success
  */
-int db_create_pool_record(B_DB *mdb, POOL_DBR *pr)
+int db_create_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    int len;
    POOL_DBR mpr;
 
    memset(&mpr, 0, sizeof(mpr));
    strcpy(mpr.Name, pr->Name);
-   if (db_get_pool_record(mdb, &mpr)) {
+   if (db_get_pool_record(jcr, mdb, &mpr)) {
       Mmsg1(&mdb->errmsg, "Pool record %s already exists\n", mpr.Name);
       return 0;
    }
@@ -180,14 +180,14 @@ int db_create_pool_record(B_DB *mdb, POOL_DBR *pr)
  * Returns: 0 on failure
  *	    1 on success
  */ 
-int db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
+int db_create_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    int len;
    MEDIA_DBR mmr;
 
    memset(&mmr, 0, sizeof(mmr));
    strcpy(mmr.VolumeName, mr->VolumeName);
-   if (db_get_media_record(mdb, &mmr)) {
+   if (db_get_media_record(jcr, mdb, &mmr)) {
       Mmsg1(&mdb->errmsg, "Media record %s already exists\n", mmr.VolumeName);
       return 0;
    }
@@ -216,13 +216,13 @@ int db_create_media_record(B_DB *mdb, MEDIA_DBR *mr)
  * Returns: 0 on failure
  *	    1 on success
  */
-int db_create_client_record(B_DB *mdb, CLIENT_DBR *cr)
+int db_create_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    int len;
    CLIENT_DBR lcr;
 
    cr->ClientId = 0;
-   if (db_get_client_record(mdb, cr)) {
+   if (db_get_client_record(jcr, mdb, cr)) {
       Mmsg1(&mdb->errmsg, "Client record %s already exists\n", cr->Name);
       return 1;
    }
@@ -257,13 +257,13 @@ int db_create_client_record(B_DB *mdb, CLIENT_DBR *cr)
  * Returns: 0 on failure
  *	    1 on success
  */
-int db_create_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
+int db_create_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
 {
    int len;
    FILESET_DBR lfsr;
 
    fsr->FileSetId = 0;
-   if (db_get_fileset_record(mdb, fsr)) {
+   if (db_get_fileset_record(jcr, mdb, fsr)) {
       Mmsg1(&mdb->errmsg, "FileSet record %s already exists\n", fsr->FileSet);
       return 1;
    }
diff --git a/bacula/src/cats/bdb_delete.c b/bacula/src/cats/bdb_delete.c
index ec5d53a317..de43815f11 100644
--- a/bacula/src/cats/bdb_delete.c
+++ b/bacula/src/cats/bdb_delete.c
@@ -14,7 +14,7 @@
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -61,13 +61,13 @@
  * Returns: 0 on error
  *	    the number of records deleted on success 
  */
-int db_delete_pool_record(B_DB *mdb, POOL_DBR *pr)
+int db_delete_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    int stat;
    POOL_DBR opr;
 
    pr->PoolId = 0;		      /* Search on Pool Name */
-   if (!db_get_pool_record(mdb, pr)) {
+   if (!db_get_pool_record(jcr, mdb, pr)) {
       Mmsg1(&mdb->errmsg, "No pool record %s exists\n", pr->Name);
       return 0;
    }
@@ -79,12 +79,12 @@ int db_delete_pool_record(B_DB *mdb, POOL_DBR *pr)
    return stat; 
 }
 
-int db_delete_media_record(B_DB *mdb, MEDIA_DBR *mr) 
+int db_delete_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr) 
 { 
    int stat;
    MEDIA_DBR omr;
 
-   if (!db_get_media_record(mdb, mr)) {
+   if (!db_get_media_record(jcr, mdb, mr)) {
       Mmsg0(&mdb->errmsg, "Media record not found.\n");
       return 0;
    }
diff --git a/bacula/src/cats/bdb_find.c b/bacula/src/cats/bdb_find.c
index 2c51a77094..56dbcefcbd 100644
--- a/bacula/src/cats/bdb_find.c
+++ b/bacula/src/cats/bdb_find.c
@@ -18,7 +18,7 @@
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -49,7 +49,6 @@
 #ifdef HAVE_BACULA_DB
 
 /* Forward referenced functions */
-int db_find_job_start_time(B_DB *mdb, JOB_DBR *jr, POOLMEM **stime);
 
 /* -----------------------------------------------------------------------
  *
@@ -66,7 +65,7 @@ int db_find_job_start_time(B_DB *mdb, JOB_DBR *jr, POOLMEM **stime);
  * Returns: 0 on failure
  *	    1 on success, jr unchanged, but stime set
  */
-int db_find_job_start_time(B_DB *mdb, JOB_DBR *jr, POOLMEM **stime)
+int db_find_job_start_time(void *jcr, B_DB *mdb, JOB_DBR *jr, POOLMEM **stime)
 {
    char cmd[MAXSTRING], Name[MAX_NAME_LENGTH], StartTime[MAXSTRING];
    int Type, Level;
@@ -145,7 +144,7 @@ StartTime=%100s", &JobId, Name, cType, cLevel, StartTime) == 5) {
  * Returns: 0 on failure
  *	    numrows on success
  */
-int db_find_next_volume(B_DB *mdb, int item, MEDIA_DBR *mr)
+int db_find_next_volume(void *jcr, B_DB *mdb, int item, MEDIA_DBR *mr)
 {
    MEDIA_DBR omr;
    int stat = 0;
@@ -177,7 +176,7 @@ int db_find_next_volume(B_DB *mdb, int item, MEDIA_DBR *mr)
    return stat; 		
 }
 
-int db_find_last_jobid(B_DB *mdb, JOB_DBR *jr) { return 0; }
+int db_find_last_jobid(void *jcr, B_DB *mdb, JOB_DBR *jr) { return 0; }
 
 
 #endif /* HAVE_BACULA_DB */
diff --git a/bacula/src/cats/bdb_get.c b/bacula/src/cats/bdb_get.c
index dbd1953420..7c4e0f4d0e 100644
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -49,8 +49,6 @@
 #ifdef HAVE_BACULA_DB
 
 /* Forward referenced functions */
-int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr);
-int db_get_pool_record(B_DB *mdb, POOL_DBR *pr);
 
 
 /* -----------------------------------------------------------------------
@@ -67,7 +65,7 @@ int db_get_pool_record(B_DB *mdb, POOL_DBR *pr);
  *	    1 on success
  */
 
-int db_get_job_record(B_DB *mdb, JOB_DBR *jr)
+int db_get_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
 { 
    JOB_DBR ojr;
    faddr_t rec_addr;
@@ -129,7 +127,7 @@ int db_get_job_record(B_DB *mdb, JOB_DBR *jr)
  * Returns: -1 on failure
  *	    number on success
  */
-int db_get_num_pool_records(B_DB *mdb)
+int db_get_num_pool_records(void *jcr, B_DB *mdb)
 {
    int stat = 0;
 
@@ -146,7 +144,7 @@ int db_get_num_pool_records(B_DB *mdb)
  *  Returns 0: on failure
  *	    1: on success
  */
-int db_get_pool_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_pool_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 {
    int i = 0;
    uint32_t *id;
@@ -182,7 +180,7 @@ int db_get_pool_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
  * Returns: 0 on failure
  *	    id on success 
  */
-int db_get_pool_record(B_DB *mdb, POOL_DBR *pr)
+int db_get_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    POOL_DBR opr;
    faddr_t rec_addr;
@@ -238,7 +236,7 @@ int db_get_pool_record(B_DB *mdb, POOL_DBR *pr)
  * Returns: -1 on failure
  *	    number on success
  */
-int db_get_num_media_records(B_DB *mdb)
+int db_get_num_media_records(void *jcr, B_DB *mdb)
 {
    int stat = 0;
 
@@ -255,7 +253,7 @@ int db_get_num_media_records(B_DB *mdb)
  *  Returns 0: on failure
  *	    1: on success
  */
-int db_get_media_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_media_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 {
    int i = 0;
    uint32_t *id;
@@ -294,7 +292,7 @@ int db_get_media_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
  * Returns: 0 on failure
  *	    id on success 
  */
-int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr)
+int db_get_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    faddr_t rec_addr;
    int found = 0;
@@ -353,7 +351,7 @@ int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr)
  *		Volumes are concatenated in VolumeNames
  *		separated by a vertical bar (|).
  */
-int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
+int db_get_job_volume_names(void *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
 {
    int found = 0;
    JOBMEDIA_DBR jm;
@@ -403,7 +401,7 @@ int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
  * Returns: 0 on failure
  *	    id on success 
  */
-int db_get_client_record(B_DB *mdb, CLIENT_DBR *cr)
+int db_get_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    CLIENT_DBR lcr;
    int len;
@@ -450,7 +448,7 @@ int db_get_client_record(B_DB *mdb, CLIENT_DBR *cr)
  * Returns: 0 on failure
  *	    id on success 
  */
-int db_get_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
+int db_get_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
 {
    FILESET_DBR lfsr;
    int stat = 0;
@@ -491,13 +489,13 @@ int db_get_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
 
 
 
-int db_get_file_attributes_record(B_DB *mdb, char *fname, FILE_DBR *fdbr) 
+int db_get_file_attributes_record(void *jcr, B_DB *mdb, char *fname, FILE_DBR *fdbr) 
 { return 0; }
 
-int db_get_job_volume_parameters(B_DB *mdb, uint32_t JobId, VOL_PARAMS **VolParams)
+int db_get_job_volume_parameters(void *jcr, B_DB *mdb, uint32_t JobId, VOL_PARAMS **VolParams)
 { return 0; }
 
-int db_get_client_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_client_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 { return 0; }
 
 #endif /* HAVE_BACULA_DB */
diff --git a/bacula/src/cats/bdb_list.c b/bacula/src/cats/bdb_list.c
index 4b5f1f452a..7c04512fb7 100644
--- a/bacula/src/cats/bdb_list.c
+++ b/bacula/src/cats/bdb_list.c
@@ -14,7 +14,7 @@
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -57,8 +57,8 @@
 /* 
  * Submit general SQL query
  */
-int db_list_sql_query(B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx,
-		      int verbose)
+int db_list_sql_query(void *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, 
+		      void *ctx, int verbose)
 {
    sendit(ctx, "SQL Queries not implemented with internal database.\n");
    return 0;
@@ -68,7 +68,7 @@ int db_list_sql_query(B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx
 /*
  * List all the pool records
  */
-void db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_pool_records(void *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
 {
    int len;
    POOL_DBR pr;
@@ -98,7 +98,8 @@ void db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
 /*
  * List Media records
  */
-void db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_media_records(void *jcr, B_DB *mdb, MEDIA_DBR *mdbr, 
+			   DB_LIST_HANDLER *sendit, void *ctx)
 {
    char ewc[30];
    int len;
@@ -124,7 +125,8 @@ void db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit,
    return;
 }
 
-void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_jobmedia_records(void *jcr, B_DB *mdb, uint32_t JobId, 
+			      DB_LIST_HANDLER *sendit, void *ctx)
 {
    JOBMEDIA_DBR jm;
    MEDIA_DBR mr;
@@ -182,7 +184,8 @@ void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit
 /*
  * List Job records
  */
-void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_job_records(void *jcr, B_DB *mdb, JOB_DBR *jr, 
+			 DB_LIST_HANDLER *sendit, void *ctx)
 {
    int jrlen;
    JOB_DBR ojr;
@@ -229,7 +232,8 @@ void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *
 /*
  * List Job Totals
  */
-void db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_job_totals(void *jcr, B_DB *mdb, JOB_DBR *jr, 
+			DB_LIST_HANDLER *sendit, void *ctx)
 {
    char ewc1[30], ewc2[30], ewc3[30];
    int jrlen;
@@ -267,10 +271,10 @@ void db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *c
 
 
 
-void db_list_files_for_job(B_DB *mdb, uint32_t jobid, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_files_for_job(void *jcr, B_DB *mdb, uint32_t jobid, DB_LIST_HANDLER *sendit, void *ctx)
 { }
 
-void db_list_client_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_client_records(void *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
 { }
 
 
diff --git a/bacula/src/cats/bdb_update.c b/bacula/src/cats/bdb_update.c
index 76abba20a7..0a82099b49 100755
--- a/bacula/src/cats/bdb_update.c
+++ b/bacula/src/cats/bdb_update.c
@@ -15,7 +15,7 @@
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -61,7 +61,7 @@
  * most current start fields to the job record.
  * It is assumed that you did a db_create_job_record() already.
  */
-int db_update_job_start_record(B_DB *mdb, JOB_DBR *jr)	  
+int db_update_job_start_record(void *jcr, B_DB *mdb, JOB_DBR *jr)    
 {
    int len, stat = 1;
    JOB_DBR ojr;
@@ -70,7 +70,7 @@ int db_update_job_start_record(B_DB *mdb, JOB_DBR *jr)
    len = sizeof(ojr);
    memcpy(&ojr, jr, len);
 
-   if (!db_get_job_record(mdb, &ojr)) {
+   if (!db_get_job_record(jcr, mdb, &ojr)) {
       return 0;
    }
 
@@ -91,7 +91,7 @@ int db_update_job_start_record(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(B_DB *mdb, JOB_DBR *jr)	
+int db_update_job_end_record(void *jcr, B_DB *mdb, JOB_DBR *jr)    
 {
    int len, stat = 1;
    JOB_DBR ojr;
@@ -100,7 +100,7 @@ int db_update_job_end_record(B_DB *mdb, JOB_DBR *jr)
    len = sizeof(ojr);
    memcpy(&ojr, jr, len);
 
-   if (!db_get_job_record(mdb, &ojr)) {
+   if (!db_get_job_record(jcr, mdb, &ojr)) {
       return 0;
    }
 
@@ -118,7 +118,7 @@ int db_update_job_end_record(B_DB *mdb, JOB_DBR *jr)
 }
 
 
-int db_update_media_record(B_DB *mdb, MEDIA_DBR *mr) 
+int db_update_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr) 
 { 
    int stat = 1;
    MEDIA_DBR omr;
@@ -129,7 +129,7 @@ int db_update_media_record(B_DB *mdb, MEDIA_DBR *mr)
    len = sizeof(omr);
    memcpy(&omr, mr, len);
 
-   if (!db_get_media_record(mdb, &omr)) {
+   if (!db_get_media_record(jcr, mdb, &omr)) {
       return 0;
    }
 
@@ -155,7 +155,7 @@ int db_update_media_record(B_DB *mdb, MEDIA_DBR *mr)
    return stat;
 }
 
-int db_update_pool_record(B_DB *mdb, POOL_DBR *pr) 
+int db_update_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr) 
 { 
    int stat = 1;
    POOL_DBR opr;
@@ -165,7 +165,7 @@ int db_update_pool_record(B_DB *mdb, POOL_DBR *pr)
    len = sizeof(opr);
    memcpy(&opr, pr, len);
 
-   if (!db_get_pool_record(mdb, &opr)) {
+   if (!db_get_pool_record(jcr, mdb, &opr)) {
       return 0;
    }
 
@@ -192,12 +192,12 @@ int db_update_pool_record(B_DB *mdb, POOL_DBR *pr)
    return stat;
 }
 
-int db_add_MD5_to_file_record(B_DB *mdb, FileId_t FileId, char *MD5)   
+int db_add_MD5_to_file_record(void *jcr, B_DB *mdb, FileId_t FileId, char *MD5)   
 {
    return 1;
 }
 
-int db_mark_file_record(B_DB *mdb, FileId_t FileId, JobId_t JobId)
+int db_mark_file_record(void *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId)
 { 
    return 1;
 }
-- 
2.39.5