Various cleanups

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index d135f578edecff5dced1bafa554610e9a511bb79..54601493ba4e4ee7c43b2577ac76814c352fe68f 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -756,49 +756,37 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
        const u8 *hash;
        struct lookup_table_entry *lte;
        const struct inode *inode = dentry->d_inode;
-       time_t time;
-       char *p;
+       char buf[50];
 
        printf("[DENTRY]\n");
        printf("Length            = %"PRIu64"\n", dentry->length);
        printf("Attributes        = 0x%x\n", inode->attributes);
-       for (unsigned i = 0; i < ARRAY_LEN(file_attr_flags); i++)
+       for (size_t i = 0; i < ARRAY_LEN(file_attr_flags); i++)
                if (file_attr_flags[i].flag & inode->attributes)
                        printf("    FILE_ATTRIBUTE_%s is set\n",
                                file_attr_flags[i].name);
        printf("Security ID       = %d\n", inode->security_id);
        printf("Subdir offset     = %"PRIu64"\n", dentry->subdir_offset);
 
-       /* Translate the timestamps into something readable */
-       time = wim_timestamp_to_unix(inode->creation_time);
-       p = asctime(gmtime(&time));
-       *(strrchr(p, '\n')) = '\0';
-       printf("Creation Time     = %s UTC\n", p);
+       wim_timestamp_to_str(inode->creation_time, buf, sizeof(buf));
+       printf("Creation Time     = %s\n", buf);
 
-       time = wim_timestamp_to_unix(inode->last_access_time);
-       p = asctime(gmtime(&time));
-       *(strrchr(p, '\n')) = '\0';
-       printf("Last Access Time  = %s UTC\n", p);
+       wim_timestamp_to_str(inode->last_access_time, buf, sizeof(buf));
+       printf("Last Access Time  = %s\n", buf);
 
-       time = wim_timestamp_to_unix(inode->last_write_time);
-       p = asctime(gmtime(&time));
-       *(strrchr(p, '\n')) = '\0';
-       printf("Last Write Time   = %s UTC\n", p);
+       wim_timestamp_to_str(inode->last_write_time, buf, sizeof(buf));
+       printf("Last Write Time   = %s\n", buf);
 
        printf("Reparse Tag       = 0x%"PRIx32"\n", inode->reparse_tag);
        printf("Hard Link Group   = 0x%"PRIx64"\n", inode->ino);
        printf("Hard Link Group Size = %"PRIu32"\n", inode->link_count);
        printf("Number of Alternate Data Streams = %hu\n", inode->num_ads);
-       printf("Filename          = \"");
-       print_string(dentry->file_name, dentry->file_name_len);
-       puts("\"");
-       printf("Filename Length   = %hu\n", dentry->file_name_len);
        printf("Filename (UTF-8)  = \"%s\"\n", dentry->file_name_utf8);
-       printf("Filename (UTF-8) Length = %hu\n", dentry->file_name_utf8_len);
-       printf("Short Name        = \"");
+       /*printf("Filename (UTF-8) Length = %hu\n", dentry->file_name_utf8_len);*/
+       printf("Short Name (UTF-16LE) = \"");
        print_string(dentry->short_name, dentry->short_name_len);
        puts("\"");
-       printf("Short Name Length = %hu\n", dentry->short_name_len);
+       /*printf("Short Name Length = %hu\n", dentry->short_name_len);*/
        printf("Full Path (UTF-8) = \"%s\"\n", dentry->full_path_utf8);
        lte = inode_stream_lte(dentry->d_inode, 0, lookup_table);
        if (lte) {
@@ -1037,9 +1025,8 @@ static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
  */
 void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table)
 {
-       if (!root || !root->parent)
-               return;
-       for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
+       if (root)
+               for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
 }
 
 int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
@@ -1499,11 +1486,11 @@ out_free_ads_entries:
  * @offset:    Offset of this directory entry in the metadata resource.
  * @dentry:    A `struct dentry' that will be filled in by this function.
  *
- * Return 0 on success or nonzero on failure.  On failure, @dentry have been
- * modified, bu it will be left with no pointers to any allocated buffers.
- * On success, the dentry->length field must be examined.  If zero, this was a
- * special "end of directory" dentry and not a real dentry.  If nonzero, this
- * was a real dentry.
+ * Return 0 on success or nonzero on failure.  On failure, @dentry will have
+ * been modified, but it will not be left with pointers to any allocated
+ * buffers.  On success, the dentry->length field must be examined.  If zero,
+ * this was a special "end of directory" dentry and not a real dentry.  If
+ * nonzero, this was a real dentry.
  */
 int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
                u64 offset, struct dentry *dentry)
@@ -1819,9 +1806,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
                        break;
                }
                memcpy(child, &cur_child, sizeof(struct dentry));
-
                dentry_add_child(dentry, child);
-
                inode_add_dentry(child, child->d_inode);
 
                /* If there are children of this child, call this procedure