Add verbose, Uname info, better Device error msg

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

diff --git a/bacula/src/cats/bdb_get.c b/bacula/src/cats/bdb_get.c
index 0b96eb5e1246c1b43a6ebe672af5d21888052118..b1a0b3a7b3b660b3ef73958c9bf14bf1de901599 100644 (file)
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -17,7 +17,7 @@
  */
 
 /*
-   Copyright (C) 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -49,8 +49,6 @@
 #ifdef HAVE_BACULA_DB
 
 /* Forward referenced functions */
-int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr);
-int db_get_pool_record(B_DB *mdb, POOL_DBR *pr);
 
 
 /* -----------------------------------------------------------------------
@@ -67,7 +65,7 @@ int db_get_pool_record(B_DB *mdb, POOL_DBR *pr);
  *         1 on success
  */
 
-int db_get_job_record(B_DB *mdb, JOB_DBR *jr)
+int db_get_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
 { 
    JOB_DBR ojr;
    faddr_t rec_addr;
@@ -129,7 +127,7 @@ int db_get_job_record(B_DB *mdb, JOB_DBR *jr)
  * Returns: -1 on failure
  *         number on success
  */
-int db_get_num_pool_records(B_DB *mdb)
+int db_get_num_pool_records(void *jcr, B_DB *mdb)
 {
    int stat = 0;
 
@@ -146,7 +144,7 @@ int db_get_num_pool_records(B_DB *mdb)
  *  Returns 0: on failure
  *         1: on success
  */
-int db_get_pool_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_pool_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 {
    int i = 0;
    uint32_t *id;
@@ -182,7 +180,7 @@ int db_get_pool_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_pool_record(B_DB *mdb, POOL_DBR *pr)
+int db_get_pool_record(void *jcr, B_DB *mdb, POOL_DBR *pr)
 {
    POOL_DBR opr;
    faddr_t rec_addr;
@@ -238,7 +236,7 @@ int db_get_pool_record(B_DB *mdb, POOL_DBR *pr)
  * Returns: -1 on failure
  *         number on success
  */
-int db_get_num_media_records(B_DB *mdb)
+int db_get_num_media_records(void *jcr, B_DB *mdb)
 {
    int stat = 0;
 
@@ -255,7 +253,7 @@ int db_get_num_media_records(B_DB *mdb)
  *  Returns 0: on failure
  *         1: on success
  */
-int db_get_media_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
+int db_get_media_ids(void *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[])
 {
    int i = 0;
    uint32_t *id;
@@ -294,7 +292,7 @@ int db_get_media_ids(B_DB *mdb, int *num_ids, uint32_t *ids[])
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr)
+int db_get_media_record(void *jcr, B_DB *mdb, MEDIA_DBR *mr)
 {
    faddr_t rec_addr;
    int found = 0;
@@ -353,7 +351,7 @@ int db_get_media_record(B_DB *mdb, MEDIA_DBR *mr)
  *             Volumes are concatenated in VolumeNames
  *             separated by a vertical bar (|).
  */
-int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
+int db_get_job_volume_names(void *jcr, B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
 {
    int found = 0;
    JOBMEDIA_DBR jm;
@@ -371,7 +369,7 @@ int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
    }
    jmlen = sizeof(jm);
    mrlen = sizeof(mr);
-   *VolumeNames = 0;
+   *VolumeNames[0] = 0;
    fseek(mdb->jobmediafd, 0L, SEEK_SET); /* rewind the file */
    while (fread(&jm, jmlen, 1, mdb->jobmediafd) > 0) {
       if (jm.JobId == JobId) {
@@ -379,7 +377,7 @@ int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
         fseek(mdb->mediafd, 0L, SEEK_SET);
         while (fread(&mr, mrlen, 1, mdb->mediafd) > 0) {
            if (jm.MediaId == mr.MediaId) {
-              if (*VolumeNames != 0) {         /* if not first name, */
+              if (*VolumeNames[0] != 0) {      /* if not first name, */
                   pm_strcat(VolumeNames, "|");  /* add separator */
               }
               pm_strcat(VolumeNames, mr.VolumeName); /* add Volume Name */
@@ -403,7 +401,7 @@ int db_get_job_volume_names(B_DB *mdb, uint32_t JobId, POOLMEM **VolumeNames)
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_client_record(B_DB *mdb, CLIENT_DBR *cr)
+int db_get_client_record(void *jcr, B_DB *mdb, CLIENT_DBR *cr)
 {
    CLIENT_DBR lcr;
    int len;
@@ -450,7 +448,7 @@ int db_get_client_record(B_DB *mdb, CLIENT_DBR *cr)
  * Returns: 0 on failure
  *         id on success 
  */
-int db_get_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
+int db_get_fileset_record(void *jcr, B_DB *mdb, FILESET_DBR *fsr)
 {
    FILESET_DBR lfsr;
    int stat = 0;
@@ -491,11 +489,13 @@ int db_get_fileset_record(B_DB *mdb, FILESET_DBR *fsr)
 
 
 
-int db_get_file_attributes_record(B_DB *mdb, char *fname, FILE_DBR *fdbr) 
+int db_get_file_attributes_record(void *jcr, B_DB *mdb, char *fname, FILE_DBR *fdbr) 
 { return 0; }
 
-int db_get_job_volume_parameters(B_DB *mdb, uint32_t JobId, VOL_PARAMS **VolParams)
+int db_get_job_volume_parameters(void *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[])
+{ return 0; }
 
 #endif /* HAVE_BACULA_DB */