Update

[bacula/bacula] / bacula / src / findlib / bfile.c

diff --git a/bacula/src/findlib/bfile.c b/bacula/src/findlib/bfile.c
index 191ff57c785fa02b95c2783b08eecf0f27a4ad8a..19ffcc39d61e2edc679e70a48fce4c9583a89e45 100644 (file)
--- a/bacula/src/findlib/bfile.c
+++ b/bacula/src/findlib/bfile.c
@@ -96,9 +96,10 @@ const char *stream_to_ascii(int stream)
 BOOL processWin32BackupAPIBlock (BFILE *bfd, void *pBuffer, size_t dwSize)
 {   
    /* pByte contains the buffer 
-      dwSize the len to be processed. function assumes to be called in successive
-      incremental order over the complete BackupRead stream beginning at pos 0 and
-      ending at the end. */
+      dwSize the len to be processed.  function assumes to be
+      called in successive incremental order over the complete
+      BackupRead stream beginning at pos 0 and ending at the end.
+    */
 
    PROCESS_WIN32_BACKUPAPIBLOCK_CONTEXT* pContext = &(bfd->win32DecompContext);
    BOOL bContinue = FALSE;
@@ -132,8 +133,9 @@ BOOL processWin32BackupAPIBlock (BFILE *bfd, void *pBuffer, size_t dwSize)
          DWORD dwOffsetSource;
             
          if (pContext->liNextHeader < 0) {
-            /* start of header was before this block,
-               so we continue with the part in the current block */                                   
+            /* start of header was before this block, so we
+             * continue with the part in the current block 
+             */
             dwOffsetTarget = abs (pContext->liNextHeader);
             dwOffsetSource = 0;                            
          }
@@ -147,7 +149,9 @@ BOOL processWin32BackupAPIBlock (BFILE *bfd, void *pBuffer, size_t dwSize)
          BOOL bHeaderIsComplete;
 
          if (dwHeaderPartLen <= dwSize-dwOffsetSource) 
-            /* header (or rest of header) is completely available in current block */
+            /* header (or rest of header) is completely available
+               in current block 
+             */
             bHeaderIsComplete = TRUE;                                                        
          else  {
             /* header will continue in next block */
@@ -248,31 +252,33 @@ bool have_win32_api()
 
 
 /*
- * Return 1 if we support the stream
- *        0 if we do not support the stream
+ * Return true  if we support the stream
+ *        false if we do not support the stream
  */
 bool is_stream_supported(int stream)
 {
    /* No Win32 backup on this machine */
    switch (stream) {
-/*#ifndef HAVE_LIBZ
-   case STREAM_GZIP_DATA:
-   case STREAM_SPARSE_GZIP_DATA:
-      return 0;
-#endif*/
    case STREAM_WIN32_DATA:
+#ifdef HAVE_ZLIB
    case STREAM_WIN32_GZIP_DATA:
+#endif
 #ifdef USE_WIN32STREAMEXTRACTION
       return true;
 #else
       return have_win32_api();      
 #endif
 
-/*
+/* Streams known not to be supported */
+#ifndef HAVE_LIBZ
+   case STREAM_GZIP_DATA:
+   case STREAM_SPARSE_GZIP_DATA:
+   case STREAM_WIN32_GZIP_DATA:
+#endif
    case STREAM_MACOS_FORK_DATA:
    case STREAM_HFSPLUS_ATTRIBUTES:
       return false;
-*/
+
    /* Known streams */
 #ifdef HAVE_LIBZ
    case STREAM_GZIP_DATA: