Convert restore object to use STREAM_RESTORE_OBJECT; cleaner code

[bacula/bacula] / bacula / src / findlib / find.h

diff --git a/bacula/src/findlib/find.h b/bacula/src/findlib/find.h
index 3fa6afcaee6591cda2b4de48bd6e701a76fff88d..1ba8eb33dde66d14cadc481f2ceaa14381d9e6ef 100644 (file)
--- a/bacula/src/findlib/find.h
+++ b/bacula/src/findlib/find.h
@@ -36,7 +36,6 @@
 
 #include "jcr.h"
 #include "bfile.h"
-#include "savecwd.h"
 #include "../filed/fd_plugins.h"
 
 #ifdef HAVE_DIRENT_H
@@ -190,12 +189,17 @@ struct FF_PKT {
    char *top_fname;                   /* full filename before descending */
    char *fname;                       /* full filename */
    char *link;                        /* link if file linked */
+   char *object_name;                 /* Object name */
+   char *object;                      /* restore object */
    POOLMEM *sys_fname;                /* system filename */
    POOLMEM *fname_save;               /* save when stripping path */
    POOLMEM *link_save;                /* save when stripping path */
    struct stat statp;                 /* stat packet */
    int32_t FileIndex;                 /* FileIndex of this file */
    int32_t LinkFI;                    /* FileIndex of main hard linked file */
+   int32_t object_index;              /* Object index */
+   int32_t object_len;                /* Object length */
+   int32_t object_compression;        /* Type of compression for object */
    struct f_link *linked;             /* Set if this file is hard linked */
    int type;                          /* FT_ type from above */
    int ff_errno;                      /* errno */