From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 31 May 2015 14:31:11 +0000 (-0500)
Subject: Rename num_remaining_streams => i_num_remaining_streams
X-Git-Tag: v1.8.2~92
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=e405166879d12191a55cde5bcc278a79e1dd2fe7

Rename num_remaining_streams => i_num_remaining_streams
---

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index 21fb9f53..86d3feb3 100644
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -206,7 +206,7 @@ struct wim_inode {
 		 * WIMLIB_WRITE_FLAG_SEND_DONE_WITH_FILE_MESSAGES:  the number
 		 * of streams this inode has that have not yet been fully read.
 		 * */
-		u32 num_remaining_streams;
+		u32 i_num_remaining_streams;
 
 #ifdef WITH_FUSE
 		struct {
diff --git a/src/write.c b/src/write.c
index 4ee29def..bb8f1856 100644
--- a/src/write.c
+++ b/src/write.c
@@ -654,8 +654,8 @@ do_done_with_blob(struct blob_descriptor *blob,
 	inode = blob->file_inode;
 
 	wimlib_assert(inode != NULL);
-	wimlib_assert(inode->num_remaining_streams > 0);
-	if (--inode->num_remaining_streams > 0)
+	wimlib_assert(inode->i_num_remaining_streams > 0);
+	if (--inode->i_num_remaining_streams > 0)
 		return 0;
 
 #ifdef __WIN32__
@@ -1361,7 +1361,7 @@ init_done_with_file_info(struct list_head *blob_list)
 
 	list_for_each_entry(blob, blob_list, write_blobs_list) {
 		if (blob_is_in_file(blob)) {
-			blob->file_inode->num_remaining_streams = 0;
+			blob->file_inode->i_num_remaining_streams = 0;
 			blob->may_send_done_with_file = 1;
 		} else {
 			blob->may_send_done_with_file = 0;
@@ -1370,7 +1370,7 @@ init_done_with_file_info(struct list_head *blob_list)
 
 	list_for_each_entry(blob, blob_list, write_blobs_list)
 		if (blob->may_send_done_with_file)
-			blob->file_inode->num_remaining_streams++;
+			blob->file_inode->i_num_remaining_streams++;
 }
 
 /*