Simplify two messages in acquire.c

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

diff --git a/bacula/src/stored/record.c b/bacula/src/stored/record.c
index e55a514997081303b52560a6624f477ae287057e..2257a1b63ef83f2654daa8feb72c49cd89592ea9 100644 (file)
--- a/bacula/src/stored/record.c
+++ b/bacula/src/stored/record.c
@@ -9,7 +9,7 @@
  *
  */
 /*
-   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
@@ -94,6 +94,8 @@ char *stream_to_ascii(int stream, int fi)
        return "DATA";
     case STREAM_MD5_SIGNATURE:
        return "MD5";
+    case STREAM_SHA1_SIGNATURE:
+       return "SHA1";
     case STREAM_GZIP_DATA:
        return "GZIP";
     case STREAM_WIN32_ATTRIBUTES:
@@ -112,6 +114,8 @@ char *stream_to_ascii(int stream, int fi)
        return "contDATA";
     case -STREAM_MD5_SIGNATURE:
        return "contMD5";
+    case -STREAM_SHA1_SIGNATURE:
+       return "contSHA1";
     case -STREAM_GZIP_DATA:
        return "contGZIP";
     case -STREAM_WIN32_ATTRIBUTES:
@@ -178,7 +182,6 @@ int write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec)
    ser_declare;
    uint32_t remlen;
 
-   sm_check(__FILE__, __LINE__, False);
    remlen = block->buf_len - block->binbuf;
 
    ASSERT(block->binbuf == (uint32_t) (block->bufp - block->buf));
@@ -216,7 +219,6 @@ rem=%d remainder=%d\n",
         rec->remainder = rec->data_len;
       } else {
         rec->remainder = rec->data_len + WRITE_RECHDR_LENGTH;
-        sm_check(__FILE__, __LINE__, False);
         return 0;
       }
    } else {
@@ -261,7 +263,6 @@ rem=%d remainder=%d\n",
       remlen -= WRITE_RECHDR_LENGTH;
    }
    if (remlen == 0) {
-      sm_check(__FILE__, __LINE__, False);
       return 0;                      /* partial transfer */
    }
 
@@ -280,7 +281,7 @@ rem=%d remainder=%d\n",
       } else {
         memcpy(block->bufp, rec->data+rec->data_len-rec->remainder, 
                remlen);
-#ifdef SMCHECK
+#ifdef xxxxxSMCHECK
         if (!sm_check_rtn(__FILE__, __LINE__, False)) {
            /* We damaged a buffer */
             Dmsg6(0, "Damaged block FI=%s SessId=%d Strm=%s len=%d\n\
@@ -305,7 +306,6 @@ rem=%d remainder=%d\n",
       }
    }
    rec->remainder = 0;               /* did whole transfer */
-   sm_check(__FILE__, __LINE__, False);
    return 1;
 }
 
@@ -452,6 +452,7 @@ remlen=%d data_len=%d\n",
       }
 #endif
       rec->state |= (REC_NO_HEADER | REC_BLOCK_EMPTY);
+      empty_block(block);                     /* mark block empty */
       return 0;
    }