resource reading cleanups

[wimlib] / include / wimlib / win32.h

diff --git a/include/wimlib/win32.h b/include/wimlib/win32.h
index 5c55b1e2c05e5552e63644e55df27786b171305a..96d2ebd2a6505e7a6a05ea95142f4b6a50db1090 100644 (file)
--- a/include/wimlib/win32.h
+++ b/include/wimlib/win32.h
@@ -3,24 +3,19 @@
 
 #ifdef __WIN32__
 
-#include "wimlib/callback.h"
 #include "wimlib/types.h"
-#include <direct.h>
-#include <windef.h>
 
-struct wim_lookup_table_entry;
-struct iovec;
+struct blob_descriptor;
+struct read_blob_callbacks;
 
 extern int
-read_winnt_file_prefix(const struct wim_lookup_table_entry *lte, u64 size,
-                      consume_data_callback_t cb, void *cb_ctx);
+read_winnt_stream_prefix(const struct blob_descriptor *blob, u64 size,
+                        const struct read_blob_callbacks *cbs);
 
 extern int
-read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte,
+read_win32_encrypted_file_prefix(const struct blob_descriptor *blob,
                                 u64 size,
-                                consume_data_callback_t cb,
-                                void *cb_ctx);
-
+                                const struct read_blob_callbacks *cbs);
 
 extern int
 win32_global_init(int init_flags);
@@ -31,19 +26,9 @@ win32_global_cleanup(void);
 extern int
 fsync(int fd);
 
-extern unsigned
-win32_get_number_of_processors(void);
-
-extern u64
-win32_get_avail_memory(void);
-
 extern tchar *
 realpath(const tchar *path, tchar *resolved_path);
 
-typedef enum {
-       CODESET
-} nl_item;
-
 extern int
 win32_rename_replacement(const tchar *oldpath, const tchar *newpath);
 
@@ -53,8 +38,8 @@ win32_truncate_replacement(const tchar *path, off_t size);
 extern int
 win32_strerror_r_replacement(int errnum, tchar *buf, size_t buflen);
 
-extern int
-win32_get_file_and_vol_ids(const wchar_t *path, u64 *ino_ret, u64 *dev_ret);
+extern FILE *
+win32_open_logfile(const wchar_t *path);
 
 extern ssize_t
 pread(int fd, void *buf, size_t count, off_t offset);
@@ -62,9 +47,6 @@ pread(int fd, void *buf, size_t count, off_t offset);
 extern ssize_t
 pwrite(int fd, const void *buf, size_t count, off_t offset);
 
-extern ssize_t
-writev(int fd, const struct iovec *iov, int iovcnt);
-
 #endif /* __WIN32__ */
 
 #endif /* _WIMLIB_WIN32_H */