First cut 1.27 see kes23Oct02

[bacula/bacula] / bacula / src / cats / bdb_update.c

diff --git a/bacula/src/cats/bdb_update.c b/bacula/src/cats/bdb_update.c
index 00bed656bf61d7763efb859c1f2239c5cd30764d..50a3a5090042b98a7a7531f205c8df6032cd6057 100755 (executable)
--- a/bacula/src/cats/bdb_update.c
+++ b/bacula/src/cats/bdb_update.c
@@ -63,7 +63,7 @@
  */
 int db_update_job_start_record(B_DB *mdb, JOB_DBR *jr)   
 {
-   int len, stat;
+   int len, stat = 1;
    JOB_DBR ojr;
 
    Dmsg0(200, "In db_update_job_start_record\n");
@@ -74,7 +74,7 @@ int db_update_job_start_record(B_DB *mdb, JOB_DBR *jr)
       return 0;
    }
 
-   P(mdb->mutex);
+   db_lock(mdb);
 
    fseek(mdb->jobfd, ojr.rec_addr, SEEK_SET);
    if (fwrite(jr, len, 1, mdb->jobfd) != 1) {
@@ -83,7 +83,7 @@ int db_update_job_start_record(B_DB *mdb, JOB_DBR *jr)
    }
    fflush(mdb->jobfd);
 
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
@@ -93,7 +93,7 @@ int db_update_job_start_record(B_DB *mdb, JOB_DBR *jr)
  */
 int db_update_job_end_record(B_DB *mdb, JOB_DBR *jr)   
 {
-   int len, stat;
+   int len, stat = 1;
    JOB_DBR ojr;
 
    Dmsg0(200, "In db_update_job_start_record\n");
@@ -104,7 +104,7 @@ int db_update_job_end_record(B_DB *mdb, JOB_DBR *jr)
       return 0;
    }
 
-   P(mdb->mutex);
+   db_lock(mdb);
 
    fseek(mdb->jobfd, ojr.rec_addr, SEEK_SET);
    if (fwrite(jr, len, 1, mdb->jobfd) != 1) {
@@ -113,7 +113,7 @@ int db_update_job_end_record(B_DB *mdb, JOB_DBR *jr)
    }
    fflush(mdb->jobfd);
 
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
@@ -133,7 +133,7 @@ int db_update_media_record(B_DB *mdb, MEDIA_DBR *mr)
       return 0;
    }
 
-   P(mdb->mutex);
+   db_lock(mdb);
 
    /* Don't allow some fields to change by copying from master record */
    strcpy(mr->VolumeName, omr.VolumeName);
@@ -151,7 +151,7 @@ int db_update_media_record(B_DB *mdb, MEDIA_DBR *mr)
    }
    fflush(mdb->mediafd);
 
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
@@ -169,7 +169,7 @@ int db_update_pool_record(B_DB *mdb, POOL_DBR *pr)
       return 0;
    }
 
-   P(mdb->mutex);
+   db_lock(mdb);
 
    /* Update specific fields */
    opr.NumVols = pr->NumVols;
@@ -188,7 +188,7 @@ int db_update_pool_record(B_DB *mdb, POOL_DBR *pr)
    }
    fflush(mdb->poolfd);
 
-   V(mdb->mutex);
+   db_unlock(mdb);
    return stat;
 }
 
@@ -197,7 +197,7 @@ int db_add_MD5_to_file_record(B_DB *mdb, FileId_t FileId, char *MD5)
    return 1;
 }
 
-int db_mark_file_record(B_DB *mdb, FileId_t FileId, int JobId) 
+int db_mark_file_record(B_DB *mdb, FileId_t FileId, JobId_t JobId)
 { 
    return 1;
 }