restore cmd + misc -- see kes04Aug02

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

diff --git a/bacula/src/cats/bdb_list.c b/bacula/src/cats/bdb_list.c
index 36d22e73b92fe1b6ec8b7b5ee510bd762aca0081..06d92923e0aaf6c087cd2d9d6b2f5a976f2c57c2 100644 (file)
--- a/bacula/src/cats/bdb_list.c
+++ b/bacula/src/cats/bdb_list.c
@@ -9,6 +9,8 @@
  *  system.
  *   
  *    Kern Sibbald, January MMI 
+ *
+ *    Version $Id$
  */
 
 /*
@@ -55,7 +57,8 @@
 /* 
  * Submit general SQL query
  */
-int db_list_sql_query(B_DB *mdb, char *query, DB_LIST_HANDLER *sendit, void *ctx)
+int db_list_sql_query(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;
@@ -71,9 +74,9 @@ void db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
    POOL_DBR pr;
 
    Dmsg0(90, "Enter list_pool_records\n");
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_pools_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    sendit(ctx, "  PoolId NumVols MaxVols  Type       PoolName\n");
@@ -86,7 +89,7 @@ void db_list_pool_records(B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx)
         sendit(ctx, mdb->cmd);
    }
    sendit(ctx, "===================================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    Dmsg0(90, "Leave list_pool_records\n");
    return;
 }
@@ -101,9 +104,9 @@ void db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit,
    int len;
    MEDIA_DBR mr;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_media_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    sendit(ctx, "  Status           VolBytes  MediaType        VolumeName\n");
@@ -117,7 +120,7 @@ void db_list_media_records(B_DB *mdb, MEDIA_DBR *mdbr, DB_LIST_HANDLER *sendit,
         sendit(ctx, mdb->cmd);
    }
    sendit(ctx, "====================================================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }
 
@@ -127,13 +130,13 @@ void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit
    MEDIA_DBR mr;
    int jmlen, mrlen;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobmedia_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    if (!bdb_open_media_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    sendit(ctx, "    JobId VolumeName    FirstIndex LastIndex\n");
@@ -171,7 +174,7 @@ void db_list_jobmedia_records(B_DB *mdb, uint32_t JobId, DB_LIST_HANDLER *sendit
    }
 
    sendit(ctx, "============================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }
 
@@ -188,9 +191,9 @@ void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *
    char dt[MAX_TIME_LENGTH];
    struct tm tm;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobs_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    fseek(mdb->jobfd, 0L, SEEK_SET);   /* rewind file */
@@ -218,7 +221,7 @@ void db_list_job_records(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *
       sendit(ctx, mdb->cmd);
    }
    sendit(ctx, "============================================================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }
 
@@ -235,9 +238,9 @@ void db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *c
    uint64_t total_files = 0;
    uint32_t total_jobs = 0;
 
-   P(mdb->mutex);
+   db_lock(mdb);
    if (!bdb_open_jobs_file(mdb)) {
-      V(mdb->mutex);
+      db_unlock(mdb);
       return;
    }
    fseek(mdb->jobfd, 0L, SEEK_SET);   /* rewind file */
@@ -258,7 +261,7 @@ void db_list_job_totals(B_DB *mdb, JOB_DBR *jr, DB_LIST_HANDLER *sendit, void *c
             edit_uint64_with_commas(total_bytes, ewc3));
    sendit(ctx, mdb->cmd);
    sendit(ctx, "=======================================\n");
-   V(mdb->mutex);
+   db_unlock(mdb);
    return;
 }