Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / install / acquire / cabinet.h

diff --git a/src/install/acquire/cabinet.h b/src/install/acquire/cabinet.h
index 59eeeda..e94a25c 100644 (file)
--- a/src/install/acquire/cabinet.h
+++ b/src/install/acquire/cabinet.h
@@ -24,6 +24,7 @@
 #include <glib/gtypes.h>
 #include <libgnomevfs/gnome-vfs-file-size.h>
 #include <libgnomevfs/gnome-vfs-handle.h>
+#include "cabinet-memory.h"
 
 
 G_BEGIN_DECLS
@@ -36,7 +37,7 @@ struct acquire_cabinet {
        gpointer base;
        guint8 *base_cached;
        GnomeVFSFileOffset offset;
-       GnomeVFSHandle *handle;
+       GnomeVFSHandle **handlep;
        GnomeVFSFileSize size;
        const gchar *filename;
        GnomeVFSURI *uri;
@@ -47,6 +48,7 @@ struct acquire_cabinet {
        GnomeVFSResult (*read)
                        (struct acquire_cabinet *acquire_cabinet,gpointer buffer,GnomeVFSFileSize bytes,GnomeVFSFileSize *bytes_read);
        gint cabinet_done,cabinet_used;
+       CaptiveAcquireCabinetMemoryObject *memory;      /* cabextract/cabextract.c memory leaks tracker */
        };
 
 void acquire_cabinet_seek(struct acquire_cabinet *acquire_cabinet,GnomeVFSFileOffset offset);
@@ -58,7 +60,7 @@ GnomeVFSResult acquire_cabinet_read
 struct acquire_cabinet *acquire_cabinet_new_from_memory
                (gconstpointer file_base,size_t file_length,GnomeVFSURI *uri,gint cabinet_used);
 struct acquire_cabinet *acquire_cabinet_new_from_handle
-               (GnomeVFSHandle *handle,GnomeVFSFileInfo *file_info,GnomeVFSURI *uri,gint cabinet_used);
+               (GnomeVFSHandle **handlep,GnomeVFSFileInfo *file_info,GnomeVFSURI *uri,gint cabinet_used);
 void acquire_cabinet_free(struct acquire_cabinet *acquire_cabinet);
 void acquire_cabinet_load(struct acquire_cabinet *acquire_cabinet);