From 5d365e3de4506fbf312f29cd3627bc7c12047a50 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Mon, 29 Dec 2008 23:15:58 +0000
Subject: [PATCH] Removed fs_info from FS_META

---
 CHANGES.txt        | 15 ++++++++++++++-
 tsk3/fs/fs_inode.c |  4 ----
 tsk3/fs/tsk_fs.h   |  1 -
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7e1aea974..512486a7d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,20 @@
 
 11/11/08: Bug Fix: Fixed crashing bug in istat on ExtX $OrphanFiles dir. Bug: 2266104
 
----------------- VERSION 3.0.0 --------------
+11/16/08: Update: Added more HFS error checking and better loading
+
+11/26/08: Update: Updated fls man page.
+
+11/30/08: Update: Removed TODO file and using tracker for bugs and feature requests. 
+
+12/29/08: Bug Fix: Fixed incorrectly setting block status in file_walk
+for compressed files (Bug: 2475246)
+
+12/29/08: Bug Fix: removed fs_info field from FS_META because it
+was not being set and should have been removed in 3.0. Reported by
+Rob Joyce and Judson Powers.  
+
+---------------- VERSION 3.0.0 -------------- 
 0/00/00: Update: Many, many, many API changes.
 
 2/14/08: Update: Added mmcat tool.
diff --git a/tsk3/fs/fs_inode.c b/tsk3/fs/fs_inode.c
index c90ca3bc8..44dcd3d51 100644
--- a/tsk3/fs/fs_inode.c
+++ b/tsk3/fs/fs_inode.c
@@ -132,7 +132,6 @@ tsk_fs_meta_close(TSK_FS_META * fs_meta)
 void
 tsk_fs_meta_reset(TSK_FS_META * a_fs_meta)
 {
-    TSK_FS_INFO *fs_tmp;
     void *content_ptr_tmp;
     size_t content_len_tmp;
     TSK_FS_ATTRLIST *attr_tmp;
@@ -140,7 +139,6 @@ tsk_fs_meta_reset(TSK_FS_META * a_fs_meta)
     char *link_tmp;
 
     // backup pointers
-    fs_tmp = a_fs_meta->fs_info;
     content_ptr_tmp = a_fs_meta->content_ptr;
     content_len_tmp = a_fs_meta->content_len;
     attr_tmp = a_fs_meta->attr;
@@ -152,8 +150,6 @@ tsk_fs_meta_reset(TSK_FS_META * a_fs_meta)
     a_fs_meta->tag = TSK_FS_META_TAG;
 
     // restore and clear the pointers
-    a_fs_meta->fs_info = fs_tmp;
-
     a_fs_meta->content_ptr = content_ptr_tmp;
     a_fs_meta->content_len = content_len_tmp;
 
diff --git a/tsk3/fs/tsk_fs.h b/tsk3/fs/tsk_fs.h
index e489296ff..36ba50a50 100644
--- a/tsk3/fs/tsk_fs.h
+++ b/tsk3/fs/tsk_fs.h
@@ -407,7 +407,6 @@ extern "C" {
      */
     typedef struct {
         int tag;                ///< \internal Will be set to TSK_FS_META_TAG if structure is allocated
-        TSK_FS_INFO *fs_info;   ///< Pointer to file system that file is located in.
 
         TSK_FS_META_FLAG_ENUM flags;    ///< Flags for this file for its allocation status etc.
         TSK_INUM_T addr;        ///< Address of the meta data structure for this file
-- 
GitLab