resource reading cleanups

[wimlib] / include / wimlib / ntfs_3g.h

diff --git a/include/wimlib/ntfs_3g.h b/include/wimlib/ntfs_3g.h
index 6648e5a1cecb081e66b136df30e73e6f0351b8af..0ee9da26818428a5b187bddb690858fd913c4ed6 100644 (file)
--- a/include/wimlib/ntfs_3g.h
+++ b/include/wimlib/ntfs_3g.h
@@ -1,31 +1,31 @@
 #ifndef _WIMLIB_NTFS_3G_H
 #define _WIMLIB_NTFS_3G_H
 
-#include "wimlib/callback.h"
+#ifdef WITH_NTFS_3G
+
 #include "wimlib/types.h"
 
 struct blob_descriptor;
-struct _ntfs_volume;
-
-#ifdef WITH_NTFS_3G
-struct _ntfs_volume;
-struct ntfs_location {
-       struct _ntfs_volume *ntfs_vol;
-       char *path;
-       utf16lechar *attr_name;
-       unsigned attr_name_nchars;
-       unsigned attr_type;
-};
-#endif
+struct ntfs_location;
+struct read_blob_callbacks;
 
 extern void
 libntfs3g_global_init(void);
 
 extern int
 read_ntfs_attribute_prefix(const struct blob_descriptor *blob, u64 size,
-                          consume_data_callback_t cb, void *cb_ctx);
+                          const struct read_blob_callbacks *cbs);
+
+extern struct ntfs_location *
+clone_ntfs_location(const struct ntfs_location *loc);
+
+extern void
+free_ntfs_location(struct ntfs_location *loc);
 
 extern int
-do_ntfs_umount(struct _ntfs_volume *vol);
+cmp_ntfs_locations(const struct ntfs_location *loc1,
+                  const struct ntfs_location *loc2);
+
+#endif /* WITH_NTFS_3G */
 
-#endif
+#endif /* _WIMLIB_NTFS_3G_H */