From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 6 Dec 2014 17:42:37 +0000 (-0600)
Subject: cleanups
X-Git-Tag: v1.7.4~43
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=dd3f804966f577b104eda649f572e8e765edc7ef

cleanups
---

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 1e4b1b93..1d869eae 100644
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -62,7 +62,7 @@ struct wim_dentry {
 	 * long names but share the same case insensitive long name.  */
 	struct list_head d_ci_conflict_list;
 
-	/* The parent of this directory entry. */
+	/* The parent of this directory entry. (The root is its own parent.)  */
 	struct wim_dentry *d_parent;
 
 	/* Linked list node that places this dentry in the list of aliases for
diff --git a/include/wimlib/metadata.h b/include/wimlib/metadata.h
index 680de0c9..8a527ac3 100644
--- a/include/wimlib/metadata.h
+++ b/include/wimlib/metadata.h
@@ -70,7 +70,7 @@ wim_get_current_security_data(WIMStruct *wim)
 	return wim_get_current_image_metadata(wim)->security_data;
 }
 
-/* Iterate over each inode in a WIM image that has not yet been hashed */
+/* Iterate over each inode in a WIM image  */
 #define image_for_each_inode(inode, imd) \
 	list_for_each_entry(inode, &(imd)->inode_list, i_list)
 
diff --git a/src/mount_image.c b/src/mount_image.c
index 3f1d272d..2daebba3 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -594,7 +594,7 @@ inode_to_stbuf(const struct wim_inode *inode,
 	stbuf->st_mtime = wim_timestamp_to_unix(inode->i_last_write_time);
 	stbuf->st_ctime = stbuf->st_mtime;
 #endif
-	stbuf->st_blocks = (stbuf->st_size + 511) / 512;
+	stbuf->st_blocks = DIV_ROUND_UP(stbuf->st_size, 512);
 	return 0;
 }
 
@@ -1144,7 +1144,7 @@ commit_image(struct wimfs_context *ctx, int unmount_flags, mqd_t mq)
 	return wimlib_overwrite(ctx->wim, write_flags, 0);
 }
 
-/* In the case of an allow_other mount, only the owner and root should be
+/* In the case of an allow_other mount, only the mount owner and root are
  * allowed to unmount the filesystem.  */
 static bool
 may_unmount_wimfs(void)
diff --git a/src/xml.c b/src/xml.c
index cdd974eb..4617e2ab 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1241,7 +1241,7 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
 
 /*
  * Calculate what to put in the <FILECOUNT>, <DIRCOUNT>, <TOTALBYTES>, and
- * <HARDLINKBYTES> elements of each <IMAGE>.
+ * <HARDLINKBYTES> elements of the specified WIM image.
  */
 void
 xml_update_image_info(WIMStruct *wim, int image)