Additional message plus exclusion fix

[bacula/bacula] / bacula / src / stored / read_record.c

diff --git a/bacula/src/stored/read_record.c b/bacula/src/stored/read_record.c
index de5d6050b3d9b2cf14bb96f880468b6112afd4ff..625e6b736eebbbe7e1d13e85a7df20c4a886c41e 100644 (file)
--- a/bacula/src/stored/read_record.c
+++ b/bacula/src/stored/read_record.c
@@ -9,7 +9,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-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
@@ -32,8 +32,9 @@
 #include "stored.h"
 
 static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec);
+#ifdef DEBUG
 static char *rec_state_to_str(DEV_RECORD *rec);
-
+#endif
 
 int read_records(JCR *jcr,  DEVICE *dev, 
        void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec),
@@ -87,7 +88,6 @@ int read_records(JCR *jcr,  DEVICE *dev,
            read_block_from_device(dev, block);
            read_record_from_block(block, trec);
            get_session_record(dev, trec, &sessrec);
-           trec->File = dev->file;
            record_cb(jcr, dev, block, trec);
            free_record(trec);
            goto next_record;
@@ -118,7 +118,6 @@ next_record:
                  block->BlockNumber, rec->remainder);
            break;
         }
-        rec->File = dev->file;
          Dmsg3(10, "read-OK. stat=%s blk=%d rem=%d\n", rec_state_to_str(rec), 
                  block->BlockNumber, rec->remainder);
         /*
@@ -219,6 +218,7 @@ static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sess
         rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
 }
 
+#ifdef DEBUG
 static char *rec_state_to_str(DEV_RECORD *rec)
 {
    static char buf[200]; 
@@ -243,3 +243,4 @@ static char *rec_state_to_str(DEV_RECORD *rec)
    }
    return buf;
 }
+#endif