xml.c: Minor cleanup

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index d0975d9599e6f2f390677c72bc82d44469b307d5..87927ed7e2d03622468b57ecd3d34c103ff20465 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -272,21 +272,13 @@ static int
 node_get_string(const xmlNode *string_node, tchar **tstr_ret)
 {
        xmlNode *child;
-       tchar *tstr = NULL;
-       int ret;
 
        if (*tstr_ret)
                return 0;
 
-       for_node_child(string_node, child) {
-               if (node_is_text(child) && child->content) {
-                       ret = utf8_to_tstr_simple(child->content, &tstr);
-                       if (ret)
-                               return ret;
-                       break;
-               }
-       }
-       *tstr_ret = tstr;
+       for_node_child(string_node, child)
+               if (node_is_text(child) && child->content)
+                       return utf8_to_tstr_simple(child->content, tstr_ret);
        return 0;
 }
 
@@ -522,7 +514,6 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info)
                else if (node_name_is(child, "LASTMODIFICATIONTIME"))
                        image_info->last_modification_time = node_get_timestamp(child);
                else if (node_name_is(child, "WINDOWS")) {
-                       DEBUG("Found <WINDOWS> tag");
                        ret = xml_read_windows_info(child,
                                                    &image_info->windows_info);
                        image_info->windows_info_exists = true;
@@ -546,7 +537,6 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info)
        }
        if (!image_info->name) {
                tchar *empty_name;
-               /*WARNING("Image with index %d has no name", image_info->index);*/
                empty_name = MALLOC(sizeof(tchar));
                if (!empty_name)
                        return WIMLIB_ERR_NOMEM;
@@ -596,7 +586,6 @@ xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info_ret)
                        if (!node_is_element(child))
                                continue;
                        if (node_name_is(child, "IMAGE")) {
-                               DEBUG("Found <IMAGE> tag");
                                ret = xml_read_image_info(child,
                                                          &wim_info->images[i]);
                                if (ret != 0)
@@ -640,10 +629,7 @@ err:
        return ret;
 }
 
-/* Prints the information contained in a `struct windows_info'.
- *
- * Warning: any strings printed here are in UTF-8 encoding.  If the locale
- * character encoding is not UTF-8, the printed strings may be garbled. */
+/* Prints the information contained in a `struct windows_info'.  */
 static void
 print_windows_info(const struct windows_info *windows_info)
 {
@@ -1184,7 +1170,6 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
 {
        struct image_info *info = arg;
        const struct wim_inode *inode = dentry->d_inode;
-       struct wim_lookup_table_entry *lte;
 
        /* Update directory count and file count.
         *
@@ -1195,19 +1180,19 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
         * points) count as regular files.  This is despite the fact that
         * junction points have FILE_ATTRIBUTE_DIRECTORY set.
         */
-       if (dentry_is_root(dentry))
-               return 0;
 
-       if (inode_is_directory(inode))
-               info->dir_count++;
-       else
-               info->file_count++;
+       if (!dentry_is_root(dentry)) {
+               if (inode_is_directory(inode))
+                       info->dir_count++;
+               else
+                       info->file_count++;
+       }
 
        /*
         * Update total bytes and hard link bytes.
         *
-        * Unfortunately there are some inconsistencies/bugs in the way this is
-        * done.
+        * We try to act the same as the MS implementation, even though there
+        * are some inconsistencies/bugs in the way it operates.
         *
         * If there are no alternate data streams in the image, the "total
         * bytes" is the sum of the size of the un-named data stream of each
@@ -1229,20 +1214,26 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
         * link bytes", and this size is multiplied by the link count (NOT one
         * less than the link count).
         */
-       lte = inode_unnamed_lte(inode, info->lookup_table);
-       if (lte) {
-               info->total_bytes += lte->size;
-               if (!dentry_is_first_in_inode(dentry))
-                       info->hard_link_bytes += lte->size;
-       }
+       if (!(inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+                                    FILE_ATTRIBUTE_REPARSE_POINT)))
+       {
+               struct wim_lookup_table_entry *lte;
+
+               lte = inode_unnamed_lte(inode, info->lookup_table);
+               if (lte) {
+                       info->total_bytes += lte->size;
+                       if (!dentry_is_first_in_inode(dentry))
+                               info->hard_link_bytes += lte->size;
+               }
 
-       if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
-               for (unsigned i = 0; i < inode->i_num_ads; i++) {
-                       if (inode->i_ads_entries[i].stream_name_nbytes) {
-                               lte = inode_stream_lte(inode, i + 1, info->lookup_table);
-                               if (lte) {
-                                       info->hard_link_bytes += inode->i_nlink *
-                                                                lte->size;
+               if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
+                       for (unsigned i = 0; i < inode->i_num_ads; i++) {
+                               if (inode->i_ads_entries[i].stream_name_nbytes) {
+                                       lte = inode_stream_lte(inode, i + 1, info->lookup_table);
+                                       if (lte) {
+                                               info->hard_link_bytes += inode->i_nlink *
+                                                                        lte->size;
+                                       }
                                }
                        }
                }
@@ -1253,9 +1244,6 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
 /*
  * Calculate what to put in the <FILECOUNT>, <DIRCOUNT>, <TOTALBYTES>, and
  * <HARDLINKBYTES> elements of each <IMAGE>.
- *
- * Please note there is no official documentation for exactly how this is done.
- * But, see calculate_dentry_statistics().
  */
 void
 xml_update_image_info(WIMStruct *wim, int image)