Remove old code from bdb.c

[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 e0eba752499506a96de315a92aebd2515fa877ac..8b0f0ea2f503489f4838b80587f7423067a24d2e 100755 (executable)
--- a/bacula/src/cats/bdb_update.c
+++ b/bacula/src/cats/bdb_update.c
@@ -9,6 +9,9 @@
  *  system.
  *   
  *    Kern Sibbald, January MMI 
+ *
+ *
+ *    Version $Id$
  */
 
 /*
@@ -71,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) {
@@ -80,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;
 }
 
@@ -101,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) {
@@ -110,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;
 }
 
@@ -130,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);
@@ -139,7 +142,7 @@ int db_update_media_record(B_DB *mdb, MEDIA_DBR *mr)
    mr->PoolId = omr.PoolId;
    mr->VolMaxBytes = omr.VolMaxBytes;
    mr->VolCapacityBytes = omr.VolCapacityBytes;
-   strcpy(mr->Recycle, omr.Recycle);
+   mr->Recycle = omr.Recycle;
 
    fseek(mdb->mediafd, omr.rec_addr, SEEK_SET);
    if (fwrite(mr, len, 1, mdb->mediafd) != 1) {
@@ -148,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;
 }
 
@@ -166,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;
@@ -185,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;
 }