New helper: inode_get_unnamed_data_stream()

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 38f74a9f5a296fc40193e26fc87ba79f1a6535cd..a345084464d11694eb1ec8e6609abf2bef33f901 100644 (file)
--- 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);
 
 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);
 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 545a940c0916a61ed6f4772c1a8c5f253b75e9e2..4b1b1d3eee8e108b3934ce5c6ba6f026cba7ac32 100644 (file)
--- 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;
 
 {
        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;
 
        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;
 
 {
        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;
 
        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;
 
 {
        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;
 
        if (!strm)
                return zero_hash;
 

diff --git a/src/mount_image.c b/src/mount_image.c
index 270e6177c31b6dec0c6bae05bbb47d85fa2d5c2a..87620defc68daf0daf2356fc2577afb4cee995bd 100644 (file)
--- 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) {
        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;
 
        } 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;
                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);
        if (!strm)
                return -ENOTDIR;
        ret = alloc_wimfs_fd(inode, strm, &fd);