Make Recycle work -- kes25May02

[bacula/bacula] / bacula / src / stored / block.h

diff --git a/bacula/src/stored/block.h b/bacula/src/stored/block.h
index b1b51e77a6f00a9fcc0a8fbc23456d5043939c4f..b6b620689f907b7fcbde4e95f3f19844c90697aa 100644 (file)
--- a/bacula/src/stored/block.h
+++ b/bacula/src/stored/block.h
@@ -30,14 +30,14 @@
 #ifndef __BLOCK_H
 #define __BLOCK_H 1
 
-#define MAX_BLOCK_LENGTH    500001     /* this is a sort of sanity check */
-#define DEFAULT_BLOCK_SIZE (512 * 126) /* 64,512 N.B. do not use 65,636 here */
+#define MAX_BLOCK_LENGTH    500001      /* this is a sort of sanity check */
+#define DEFAULT_BLOCK_SIZE (512 * 126)  /* 64,512 N.B. do not use 65,636 here */
 
 /* Block Header definitions. */
 #define BLKHDR_ID        "BB01"
 #define BLKHDR_ID_LENGTH  4
-#define BLKHDR_CS_LENGTH  4            /* checksum length */
-#define BLKHDR_LENGTH   16             /* Total length */
+#define BLKHDR_CS_LENGTH  4             /* checksum length */
+#define BLKHDR_LENGTH    16             /* Total length */
 
 /*
  * This is the Media structure for a block header
@@ -60,21 +60,21 @@ typedef struct s_block_hdr {
  *  This is the memory structure for a device block.
  */
 typedef struct s_dev_block {
-   struct s_dev_block *next;         /* pointer to next one */
+   struct s_dev_block *next;          /* pointer to next one */
    /* binbuf is the number of bytes remaining
     * in the buffer. For writes, it is bytes not yet written.
     * For reads, it is remaining bytes not yet read.
     */
-   uint32_t binbuf;                  /* bytes in buffer */
-   uint32_t block_len;               /* length of current block read */
-   uint32_t buf_len;                 /* max/default block length */
-   uint32_t BlockNumber;             /* sequential block number */
-   uint32_t read_len;                /* bytes read into buffer */  
-   int failed_write;                 /* set if write failed */
-   char *bufp;                       /* pointer into buffer */
-   char *buf;                        /* actual data buffer. This is a 
-                                      * Pool buffer!   
-                                      */
+   uint32_t binbuf;                   /* bytes in buffer */
+   uint32_t block_len;                /* length of current block read */
+   uint32_t buf_len;                  /* max/default block length */
+   uint32_t BlockNumber;              /* sequential block number */
+   uint32_t read_len;                 /* bytes read into buffer */  
+   int failed_write;                  /* set if write failed */
+   char *bufp;                        /* pointer into buffer */
+   POOLMEM *buf;                      /* actual data buffer. This is a 
+                                       * Pool buffer!   
+                                       */
 } DEV_BLOCK;
 
 #endif