cleanups

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 1e4b1b939fb613caf423fea250be357531b914c7..1d869eae023c4979b30d8efcf0a1c2e3e24a9117 100644 (file)
--- 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 680de0c93e6289637cbd1e54c5606b1fc549a0c9..8a527ac3a860125e4b559ee50ff23abaa0f09073 100644 (file)
--- 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 3f1d272dceae0b5cce6478404c577b64018afbbe..2daebba317bf90f22c57125668d7f94580b84a51 100644 (file)
--- 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 cdd974eb0574c0655bd3b3873b2012b2b6e66b69..4617e2ab4cbd6fa8a3e1bec379ccb33e6e1fcfd7 100644 (file)
--- 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)