Fix compile problems when no compression libs are available.

bareos · May 21, 2014 · a1156aa · a1156aa
1 parent 421ddd0
commit a1156aa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/src/filed/compression.c b/src/filed/compression.c
@@ -82,8 +82,10 @@ bool adjust_decompression_buffers(JCR *jcr)
 
    setup_decompression_buffers(jcr, &decompress_buf_size);
 
-   jcr->compress.inflate_buffer = get_memory(decompress_buf_size);
-   jcr->compress.inflate_buffer_size = decompress_buf_size;
+   if (decompress_buf_size > 0) {
+      jcr->compress.inflate_buffer = get_memory(decompress_buf_size);
+      jcr->compress.inflate_buffer_size = decompress_buf_size;
+   }
 
    return true;
 }

diff --git a/src/lib/compression.c b/src/lib/compression.c
@@ -847,8 +847,9 @@ bool setup_compression_buffers(JCR *jcr,
    return true;
 }
 
-bool setup_decompression_buffers(JCR *jcr)
+bool setup_decompression_buffers(JCR *jcr, uint32_t *decompress_buf_size)
 {
+   *decompress_buf_size = 0;
    return true;
 }
 

diff --git a/src/plugins/stored/autoxflate-sd.c b/src/plugins/stored/autoxflate-sd.c
@@ -440,17 +440,20 @@ static bool setup_auto_inflation(DCR *dcr)
    }
 
    setup_decompression_buffers(jcr, &decompress_buf_size);
-
-   /*
-    * See if we need to create a new compression buffer or make sure the existing is big enough.
-    */
-   if (!jcr->compress.inflate_buffer) {
-      jcr->compress.inflate_buffer = get_memory(decompress_buf_size);
-      jcr->compress.inflate_buffer_size = decompress_buf_size;
-   } else {
-      if (decompress_buf_size > jcr->compress.inflate_buffer_size) {
-         jcr->compress.inflate_buffer = realloc_pool_memory(jcr->compress.inflate_buffer, decompress_buf_size);
+   if (decompress_buf_size > 0) {
+      /*
+       * See if we need to create a new compression buffer or make sure the existing is big enough.
+       */
+      if (!jcr->compress.inflate_buffer) {
+         jcr->compress.inflate_buffer = get_memory(decompress_buf_size);
          jcr->compress.inflate_buffer_size = decompress_buf_size;
+      } else {
+         if (decompress_buf_size > jcr->compress.inflate_buffer_size) {
+            jcr->compress.inflate_buffer = realloc_pool_memory(jcr->compress.inflate_buffer, decompress_buf_size);
+            jcr->compress.inflate_buffer_size = decompress_buf_size;
+         }
+      } else {
+         return false;
       }
    }
 

diff --git a/src/stored/bextract.c b/src/stored/bextract.c
@@ -427,9 +427,11 @@ static void do_extract(char *devname)
 
    jcr->buf_size = DEFAULT_NETWORK_BUFFER_SIZE;
    setup_decompression_buffers(jcr, &decompress_buf_size);
-   memset(&jcr->compress, 0, sizeof(CMPRS_CTX));
-   jcr->compress.inflate_buffer = get_memory(decompress_buf_size);
-   jcr->compress.inflate_buffer_size = decompress_buf_size;
+   if (decompress_buf_size > 0) {
+      memset(&jcr->compress, 0, sizeof(CMPRS_CTX));
+      jcr->compress.inflate_buffer = get_memory(decompress_buf_size);
+      jcr->compress.inflate_buffer_size = decompress_buf_size;
+   }
 
    acl_data.last_fname = get_pool_memory(PM_FNAME);
    xattr_data.last_fname = get_pool_memory(PM_FNAME);