Remove old code from bdb.c

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

diff --git a/bacula/src/cats/bdb.c b/bacula/src/cats/bdb.c
index 7e3a3da6cc141ec779ab71f4128c36191f5250ae..490506a2a032947e21ea5910d77894ead5d11459 100644 (file)
--- a/bacula/src/cats/bdb.c
+++ b/bacula/src/cats/bdb.c
@@ -122,6 +122,8 @@ db_init_database(char *db_name, char *db_user, char *db_password)
    *mdb->errmsg = 0;
    mdb->cmd = get_pool_memory(PM_EMSG);  /* command buffer */
    mdb->ref_count = 1;
+   mdb->cached_path = get_pool_memory(PM_FNAME);
+   mdb->cached_path_id = 0;
    qinsert(&db_list, &mdb->bq);       /* put db in list */
    Dmsg0(200, "Done db_open_database()\n");
    mdb->cfd = -1;
@@ -138,21 +140,11 @@ db_open_database(B_DB *mdb)
 {
    char *dbf;
    int fd, badctl;
-   int errstat;
    off_t filend;
 
    Dmsg1(200, "db_open_database() %s\n", mdb->db_name);
 
    P(mutex);
-#ifdef needed
-   if ((errstat = pthread_mutex_init(&(mdb->mutex), NULL)) != 0) {
-      Mmsg1(&mdb->errmsg, "Unable to initialize DB mutex. ERR=%s\n", strerror(errstat));
-      V(mutex);
-      return 0;
-   }
-   db_lock(mdb);                    /* test it once */
-   db_unlock(mdb);
-#endif
 
    if (rwl_init(&mdb->lock) != 0) {
       Mmsg1(&mdb->errmsg, "Unable to initialize DB lock. ERR=%s\n", strerror(errno));
@@ -270,6 +262,7 @@ void db_close_database(B_DB *mdb)
       rwl_destroy(&mdb->lock);      
       free_pool_memory(mdb->errmsg);
       free_pool_memory(mdb->cmd);
+      free_pool_memory(mdb->cached_path);
       free(mdb);
    }
    V(mutex);