Update bdb to use JCR * instead of void *jcr

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@562 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c
index 980a12b8e1af14c0897ec1a84af2101ce5303a04..cd2bbb24a3667b87d6023626a3fd1eaa92418473 100644 (file)
--- a/bacula/src/cats/bdb.c
+++ b/bacula/src/cats/bdb.c
@@ -102,7 +102,7 @@ int bdb_write_control_file(B_DB *mdb)
  * never have errors, or it is really fatal.
  */
 B_DB *
-db_init_database(void *jcr, char *db_name, char *db_user, char *db_password,
+db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
                 char *db_address, int db_port, char *db_socket)
 {
    B_DB *mdb;
@@ -142,7 +142,7 @@ db_init_database(void *jcr, char *db_name, char *db_user, char *db_password,
  * which are returned in the errmsg
  */
 int
-db_open_database(void *jcr, B_DB *mdb)
+db_open_database(JCR *jcr, B_DB *mdb)
 {
    char *dbf;
    int fd, badctl;
@@ -237,7 +237,7 @@ Please reinitialize the working directory.\n"),
    return 1;
 }
 
-void db_close_database(void *jcr, B_DB *mdb)           
+void db_close_database(JCR *jcr, B_DB *mdb)           
 {
    P(mutex);
    mdb->ref_count--;
@@ -451,11 +451,11 @@ void _db_unlock(char *file, int line, B_DB *mdb)
  *  much more efficient. Usually started when inserting 
  *  file attributes.
  */
-void db_start_transaction(void *jcr, B_DB *mdb)
+void db_start_transaction(JCR *jcr, B_DB *mdb)
 {
 }
 
-void db_end_transaction(void *jcr, B_DB *mdb)
+void db_end_transaction(JCR *jcr, B_DB *mdb)
 {
 }
 

diff --git a/bacula/src/cats/bdb_create.c b/bacula/src/cats/bdb_create.c
index 0160abfb6877c322c4468754b4278b3a14187067..e86beab128471748bf51ca341ed88c17106b3b4c 100644 (file)
--- a/bacula/src/cats/bdb_create.c
+++ b/bacula/src/cats/bdb_create.c
@@ -55,13 +55,13 @@ int db_create_pool_record(B_DB *mdb, POOL_DBR *pr);
  * -----------------------------------------------------------------------
  */
 
-int db_create_file_attributes_record(void *jcr, B_DB *mdb, ATTR_DBR *ar)
+int db_create_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
 {
    /* *****FIXME***** implement this */
    return 1;
 }
 
-int db_create_file_item(void *jcr, B_DB *mdb, ATTR_DBR *ar)
+int db_create_file_item(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
 {           
    /****FIXME***** not implemented */
    return 1;
@@ -76,7 +76,7 @@ int db_create_file_item(void *jcr, B_DB *mdb, ATTR_DBR *ar)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
+int db_create_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 {
    int len;
 
@@ -105,7 +105,7 @@ int db_create_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
  * Returns: 0 on failure
  *         record-id on success
  */
-int db_create_jobmedia_record(void *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
+int db_create_jobmedia_record(JCR *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
 {
    int len;
 
@@ -137,7 +137,7 @@ int db_create_jobmedia_record(void *jcr, B_DB *mdb, JOBMEDIA_DBR *jm)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
+int db_create_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    int len;
    POOL_DBR mpr;
@@ -180,7 +180,7 @@ int db_create_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
  * Returns: 0 on failure
  *         1 on success
  */ 
-int db_create_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
+int db_create_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    int len;
    MEDIA_DBR mmr;
@@ -217,7 +217,7 @@ int db_create_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
+int db_create_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    int len;
    CLIENT_DBR lcr;
@@ -259,7 +259,7 @@ int db_create_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
  * Returns: 0 on failure
  *         1 on success
  */
-int db_create_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
+int db_create_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
 {
    int len;
    FILESET_DBR lfsr;

diff --git a/bacula/src/cats/bdb_delete.c b/bacula/src/cats/bdb_delete.c
index 982e846318535cd33e65f7cb300295029e77ab60..b2c5ad10c5551eda886d91632cd2f0d8e05c553b 100644 (file)
--- a/bacula/src/cats/bdb_delete.c
+++ b/bacula/src/cats/bdb_delete.c
@@ -61,7 +61,7 @@
  * Returns: 0 on error
  *         the number of records deleted on success 
  */
-int db_delete_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
+int db_delete_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    int stat;
    POOL_DBR opr;
@@ -80,7 +80,7 @@ int db_delete_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
    return stat; 
 }
 
-int db_delete_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr) 
+int db_delete_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) 
 { 
    int stat;
    MEDIA_DBR omr;

diff --git a/bacula/src/cats/bdb_find.c b/bacula/src/cats/bdb_find.c
index 88bc895ceac4dfa07c572670e5a189b3ae7137fe..852694647433da4b411bd2f684892caacceab741 100644 (file)
--- a/bacula/src/cats/bdb_find.c
+++ b/bacula/src/cats/bdb_find.c
@@ -65,7 +65,7 @@
  * Returns: 0 on failure
  *         1 on success, jr unchanged, but stime set
  */
-int db_find_job_start_time(void *jcr, B_DB *mdb, JOB_DBR *jr, POOLMEM **stime)
+int db_find_job_start_time(JCR *jcr, B_DB *mdb, JOB_DBR *jr, POOLMEM **stime)
 {
    char cmd[MAXSTRING], Name[MAX_NAME_LENGTH], StartTime[MAXSTRING];
    int Type, Level;
@@ -144,7 +144,7 @@ StartTime=%100s", &JobId, Name, cType, cLevel, StartTime) == 5) {
  * Returns: 0 on failure
  *         numrows on success
  */
-int db_find_next_volume(void *jcr, B_DB *mdb, int item, MEDIA_DBR *mr)
+int db_find_next_volume(JCR *jcr, B_DB *mdb, int item, MEDIA_DBR *mr)
 {
    MEDIA_DBR omr;
    int stat = 0;
@@ -176,7 +176,7 @@ int db_find_next_volume(void *jcr, B_DB *mdb, int item, MEDIA_DBR *mr)
    return stat;                
 }
 
-int db_find_last_jobid(void *jcr, B_DB *mdb, JOB_DBR *jr) { return 0; }
+int db_find_last_jobid(JCR *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 b1a0b3a7b3b660b3ef73958c9bf14bf1de901599..8b4db4e82fb0a2b048375bc658043abc3f13533f 100644 (file)
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -65,7 +65,7 @@
  *         1 on success
  */
 
-int db_get_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
+int db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)
 { 
    JOB_DBR ojr;
    faddr_t rec_addr;
@@ -127,7 +127,7 @@ int db_get_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
  * Returns: -1 on failure
  *         number on success
  */
-int db_get_num_pool_records(void *jcr, B_DB *mdb)
+int db_get_num_pool_records(JCR *jcr, B_DB *mdb)
 {
    int stat = 0;
 
@@ -144,7 +144,7 @@ int db_get_num_pool_records(void *jcr, B_DB *mdb)
  *  Returns 0: on failure
  *         1: on success
  */
-int db_get_pool_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_pool_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 {
    int i = 0;
    uint32_t *id;
@@ -180,7 +180,7 @@ int db_get_pool_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
+int db_get_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    POOL_DBR opr;
    faddr_t rec_addr;
@@ -236,7 +236,7 @@ int db_get_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
  * Returns: -1 on failure
  *         number on success
  */
-int db_get_num_media_records(void *jcr, B_DB *mdb)
+int db_get_num_media_records(JCR *jcr, B_DB *mdb)
 {
    int stat = 0;
 
@@ -253,7 +253,7 @@ int db_get_num_media_records(void *jcr, B_DB *mdb)
  *  Returns 0: on failure
  *         1: on success
  */
-int db_get_media_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_media_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 {
    int i = 0;
    uint32_t *id;
@@ -292,7 +292,7 @@ int db_get_media_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
+int db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    faddr_t rec_addr;
    int found = 0;
@@ -351,7 +351,7 @@ int db_get_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
  *             Volumes are concatenated in VolumeNames
  *             separated by a vertical bar (|).
  */
-int db_get_job_volume_names(void *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
+int db_get_job_volume_names(JCR *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
 {
    int found = 0;
    JOBMEDIA_DBR jm;
@@ -401,7 +401,7 @@ int db_get_job_volume_names(void *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **Volu
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
+int db_get_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    CLIENT_DBR lcr;
    int len;
@@ -448,7 +448,7 @@ int db_get_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
+int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
 {
    FILESET_DBR lfsr;
    int stat = 0;
@@ -489,13 +489,13 @@ int db_get_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
 
 
 
-int db_get_file_attributes_record(void *jcr, B_DB *mdb, char *fname, FILE_DBR *fdbr) 
+int db_get_file_attributes_record(JCR *jcr, B_DB *mdb, char *fname, FILE_DBR *fdbr) 
 { return 0; }
 
-int db_get_job_volume_parameters(void *jcr, B_DB *mdb, uint32_t JobId, VOL_PARAMS **VolParams)
+int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, uint32_t JobId, VOL_PARAMS **VolParams)
 { return 0; }
 
-int db_get_client_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_client_ids(JCR *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 a56e7d5fb5a3cf7b9686dee03c4d8a6e4af05036..837e1e1b8565f665c3cd5efb76d6c437874db28f 100644 (file)
--- a/bacula/src/cats/bdb_list.c
+++ b/bacula/src/cats/bdb_list.c
@@ -57,7 +57,7 @@
 /* 
  * Submit general SQL query
  */
-int db_list_sql_query(void *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, 
+int db_list_sql_query(JCR *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, 
                      void *ctx, int verbose)
 {
    sendit(ctx, "SQL Queries not implemented with internal database.\n");
@@ -68,7 +68,7 @@ int db_list_sql_query(void *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit
 /*
  * List all the pool records
  */
-void db_list_pool_records(void *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_pool_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
 {
    int len;
    POOL_DBR pr;
@@ -98,7 +98,7 @@ void db_list_pool_records(void *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *c
 /*
  * List Media records
  */
-void db_list_media_records(void *jcr, B_DB *mdb, MEDIA_DBR *mdbr, 
+void db_list_media_records(JCR *jcr, B_DB *mdb, MEDIA_DBR *mdbr, 
                           DB_LIST_HANDLER *sendit, void *ctx)
 {
    char ewc[30];
@@ -125,7 +125,7 @@ void db_list_media_records(void *jcr, B_DB *mdb, MEDIA_DBR *mdbr,
    return;
 }
 
-void db_list_jobmedia_records(void *jcr, B_DB *mdb, uint32_t JobId, 
+void db_list_jobmedia_records(JCR *jcr, B_DB *mdb, uint32_t JobId, 
                              DB_LIST_HANDLER *sendit, void *ctx)
 {
    JOBMEDIA_DBR jm;
@@ -184,7 +184,7 @@ void db_list_jobmedia_records(void *jcr, B_DB *mdb, uint32_t JobId,
 /*
  * List Job records
  */
-void db_list_job_records(void *jcr, B_DB *mdb, JOB_DBR *jr, 
+void db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, 
                         DB_LIST_HANDLER *sendit, void *ctx)
 {
    int jrlen;
@@ -232,7 +232,7 @@ void db_list_job_records(void *jcr, B_DB *mdb, JOB_DBR *jr,
 /*
  * List Job Totals
  */
-void db_list_job_totals(void *jcr, B_DB *mdb, JOB_DBR *jr, 
+void db_list_job_totals(JCR *jcr, B_DB *mdb, JOB_DBR *jr, 
                        DB_LIST_HANDLER *sendit, void *ctx)
 {
    char ewc1[30], ewc2[30], ewc3[30];
@@ -271,38 +271,38 @@ void db_list_job_totals(void *jcr, B_DB *mdb, JOB_DBR *jr,
 
 
 
-void db_list_files_for_job(void *jcr, B_DB *mdb, uint32_t jobid, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_files_for_job(JCR *jcr, B_DB *mdb, uint32_t jobid, DB_LIST_HANDLER *sendit, void *ctx)
 { }
 
-void db_list_client_records(void *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
+void db_list_client_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
 { }
 
-int db_list_sql_query(void *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, 
+int db_list_sql_query(JCR *jcr, B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, 
                      void *ctx, int verbose, e_list_type type)
 {
    return 0;
 }
 
 void
-db_list_pool_records(void *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type) 
+db_list_pool_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type) 
 { }
 
 void
-db_list_media_records(void *jcr, B_DB *mdb, MEDIA_DBR *mdbr, 
+db_list_media_records(JCR *jcr, B_DB *mdb, MEDIA_DBR *mdbr, 
                      DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
 { }
 
-void db_list_jobmedia_records(void *jcr, B_DB *mdb, uint32_t JobId, 
+void db_list_jobmedia_records(JCR *jcr, B_DB *mdb, uint32_t JobId, 
                              DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
 { }
 
 void
-db_list_job_records(void *jcr, B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, 
+db_list_job_records(JCR *jcr, B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, 
                    void *ctx, e_list_type type)
 { }
 
 void
-db_list_client_records(void *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
+db_list_client_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type)
 { }
 
 

diff --git a/bacula/src/cats/bdb_update.c b/bacula/src/cats/bdb_update.c
index 8ab9c562866419fe0d9d381e32d7522f35f757b2..a4cc3655851b7bdb24148d5a821a3e2d709b257e 100755 (executable)
--- a/bacula/src/cats/bdb_update.c
+++ b/bacula/src/cats/bdb_update.c
@@ -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(void *jcr, B_DB *mdb, JOB_DBR *jr)    
+int db_update_job_start_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)    
 {
    int len, stat = 1;
    JOB_DBR ojr;
@@ -93,7 +93,7 @@ int db_update_job_start_record(void *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(void *jcr, B_DB *mdb, JOB_DBR *jr)    
+int db_update_job_end_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr)   
 {
    int len, stat = 1;
    JOB_DBR ojr;
@@ -121,7 +121,7 @@ int db_update_job_end_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
 }
 
 
-int db_update_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr) 
+int db_update_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) 
 { 
    int stat = 1;
    MEDIA_DBR omr;
@@ -159,7 +159,7 @@ int db_update_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
    return stat;
 }
 
-int db_update_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr) 
+int db_update_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pr) 
 { 
    int stat = 1;
    POOL_DBR opr;
@@ -197,17 +197,17 @@ int db_update_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
    return stat;
 }
 
-int db_add_SIG_to_file_record(void *jcr, B_DB *mdb, FileId_t FileId, char *SIG, int type)
+int db_add_SIG_to_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, char *SIG, int type)
 {
    return 1;
 }
 
-int db_mark_file_record(void *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId)
+int db_mark_file_record(JCR *jcr, B_DB *mdb, FileId_t FileId, JobId_t JobId)
 { 
    return 1;
 }
 
-int db_update_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
+int db_update_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    return 1;
 }

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 0eeea9e4af8b7b4a40acca6e148aafe1ea2f85d1..ad5330ef93879b2c27cbbc7f2d643954e1e63022 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -377,7 +377,7 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    }
 
    dev->VolCatInfo.VolCatWrites++;
-   Dmsg1(500, "Write block of %u bytes\n", wlen);      
+   Dmsg1(300, "Write block of %u bytes\n", wlen);      
    if ((uint32_t)(stat=write(dev->fd, block->buf, (size_t)wlen)) != wlen) {
       /* We should check for errno == ENOSPC, BUT many 
        * devices simply report EIO when it is full.