diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-12-04 00:39:47 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-01-19 16:24:56 +0100 |
| commit | 4160b50a0b4c51f8b7191928cdf38d9fb0147fe2 (patch) | |
| tree | 996998b7fe506101c8d91aeb71891eaac358902e /lib/io/win32/istream.c | |
| parent | 42194bf57d470e548e03c44f5c2340d7d23a3ecb (diff) | |
Add a helper function to initialize libsquashfs objects
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/io/win32/istream.c')
| -rw-r--r-- | lib/io/win32/istream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/io/win32/istream.c b/lib/io/win32/istream.c index b591584..be3d829 100644 --- a/lib/io/win32/istream.c +++ b/lib/io/win32/istream.c @@ -77,7 +77,6 @@ static void file_destroy(sqfs_object_t *obj) istream_t *istream_open_file(const char *path) { file_istream_t *file = calloc(1, sizeof(*file)); - sqfs_object_t *obj = (sqfs_object_t *)file; istream_t *strm = (istream_t *)file; WCHAR *wpath = NULL; @@ -86,6 +85,8 @@ istream_t *istream_open_file(const char *path) return NULL; } + sqfs_object_init(file, file_destroy, NULL); + wpath = path_to_windows(path); if (wpath == NULL) goto fail_free; @@ -109,7 +110,6 @@ istream_t *istream_open_file(const char *path) strm->buffer = file->buffer; strm->precache = file_precache; strm->get_filename = file_get_filename; - obj->destroy = file_destroy; return strm; fail_path: free(file->path); @@ -122,7 +122,6 @@ fail_free: istream_t *istream_open_stdin(void) { file_istream_t *file = calloc(1, sizeof(*file)); - sqfs_object_t *obj = (sqfs_object_t *)file; istream_t *strm = (istream_t *)file; if (file == NULL) { @@ -130,9 +129,10 @@ istream_t *istream_open_stdin(void) return NULL; } + sqfs_object_init(file, file_destroy, NULL); + strm->buffer = file->buffer; strm->precache = file_precache; strm->get_filename = file_get_filename; - obj->destroy = file_destroy; return strm; } |