From 0b52336c9e67aa31c04af59867c2541384141a3d Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 30 Apr 2015 22:53:05 -0500 Subject: [PATCH] New helper: inode_get_unnamed_data_stream() --- include/wimlib/inode.h | 6 ++++++ src/inode.c | 6 +++--- src/mount_image.c | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h index 38f74a9f..a3450844 100644 --- a/include/wimlib/inode.h +++ b/include/wimlib/inode.h @@ -346,6 +346,12 @@ inode_get_stream(const struct wim_inode *inode, int stream_type, extern struct wim_inode_stream * inode_get_unnamed_stream(const struct wim_inode *inode, int stream_type); +static inline struct wim_inode_stream * +inode_get_unnamed_data_stream(const struct wim_inode *inode) +{ + return inode_get_unnamed_stream(inode, STREAM_TYPE_DATA); +} + extern struct wim_inode_stream * inode_add_stream(struct wim_inode *inode, int stream_type, const utf16lechar *stream_name, struct blob_descriptor *blob); diff --git a/src/inode.c b/src/inode.c index 545a940c..4b1b1d3e 100644 --- a/src/inode.c +++ b/src/inode.c @@ -547,7 +547,7 @@ inode_get_blob_for_unnamed_data_stream(const struct wim_inode *inode, { const struct wim_inode_stream *strm; - strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA); + strm = inode_get_unnamed_data_stream(inode); if (!strm) return NULL; @@ -561,7 +561,7 @@ inode_get_blob_for_unnamed_data_stream_resolved(const struct wim_inode *inode) { const struct wim_inode_stream *strm; - strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA); + strm = inode_get_unnamed_data_stream(inode); if (!strm) return NULL; @@ -578,7 +578,7 @@ inode_get_hash_of_unnamed_data_stream(const struct wim_inode *inode) { const struct wim_inode_stream *strm; - strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA); + strm = inode_get_unnamed_data_stream(inode); if (!strm) return zero_hash; diff --git a/src/mount_image.c b/src/mount_image.c index 270e6177..87620def 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -357,7 +357,7 @@ inode_get_data_stream_tstr(const struct wim_inode *inode, struct wim_inode_stream *strm; if (!stream_name || !*stream_name) { - strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA); + strm = inode_get_unnamed_data_stream(inode); } else { const utf16lechar *uname; @@ -1631,7 +1631,7 @@ wimfs_opendir(const char *path, struct fuse_file_info *fi) return -errno; if (!inode_is_directory(inode)) return -ENOTDIR; - strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA); + strm = inode_get_unnamed_data_stream(inode); if (!strm) return -ENOTDIR; ret = alloc_wimfs_fd(inode, strm, &fd); -- 2.43.0