Character encoding and string conversion updates

[wimlib] / include / wimlib / ntfs_3g.h

diff --git a/include/wimlib/ntfs_3g.h b/include/wimlib/ntfs_3g.h
index 7eda7c120c81ea52883efc18ca0ca30d894a6721..0328348f105ee4cfd1aed93f032112ee5a8c48b2 100644 (file)
--- a/include/wimlib/ntfs_3g.h
+++ b/include/wimlib/ntfs_3g.h
@@ -1,31 +1,28 @@
 #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;
+struct ntfs_location;
+struct read_blob_callbacks;
 
-#ifdef WITH_NTFS_3G
-struct _ntfs_volume;
-struct ntfs_location {
-       struct _ntfs_volume *ntfs_vol;
-       u64 mft_no;
-       utf16lechar *attr_name;
-       unsigned attr_name_nchars;
-       unsigned attr_type;
-};
-#endif
+extern int
+read_ntfs_attribute_prefix(const struct blob_descriptor *blob, u64 size,
+                          const struct read_blob_callbacks *cbs);
+
+extern struct ntfs_location *
+clone_ntfs_location(const struct ntfs_location *loc);
 
 extern void
-libntfs3g_global_init(void);
+free_ntfs_location(struct ntfs_location *loc);
 
 extern int
-read_ntfs_attribute_prefix(const struct blob_descriptor *blob, u64 size,
-                          consume_data_callback_t cb, void *cb_ctx);
+cmp_ntfs_locations(const struct ntfs_location *loc1,
+                  const struct ntfs_location *loc2);
 
-extern int
-do_ntfs_umount(struct _ntfs_volume *vol);
+#endif /* WITH_NTFS_3G */
 
-#endif
+#endif /* _WIMLIB_NTFS_3G_H */