From 004b87dd162516fa16ed85477b0c83094bc6fee8 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Fri, 8 Oct 2021 11:49:45 -0400
Subject: [PATCH] More cleanup
---
bindings/java/jni/auto_db_java.cpp | 13 -------------
tsk/auto/auto_db.cpp | 10 +---------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/bindings/java/jni/auto_db_java.cpp b/bindings/java/jni/auto_db_java.cpp
index 0e2854a7b..033f28e07 100644
--- a/bindings/java/jni/auto_db_java.cpp
+++ b/bindings/java/jni/auto_db_java.cpp
@@ -1228,8 +1228,6 @@ TskAutoDbJava::addUnallocatedPoolBlocksToDb(size_t & numPool) {
/* Create the unallocated space files */
TSK_FS_ATTR_RUN * unalloc_runs = tsk_pool_unallocated_runs(pool_info);
TSK_FS_ATTR_RUN * current_run = unalloc_runs;
- vector<TSK_DB_FILE_LAYOUT_RANGE> ranges;
- //fprintf(stderr, "Adding pool unallocated runs\n");
while (current_run != NULL) {
if (addUnallocBlockFileInChunks(current_run->addr * pool_info->block_size, current_run->len * pool_info->block_size, unallocVolObjId, m_curImgId) == TSK_ERR) {
@@ -1238,18 +1236,7 @@ TskAutoDbJava::addUnallocatedPoolBlocksToDb(size_t & numPool) {
return TSK_ERR;
}
- //TSK_DB_FILE_LAYOUT_RANGE tempRange(current_run->addr * pool_info->block_size, current_run->len * pool_info->block_size, 0);
-
- //ranges.push_back(tempRange);
- //int64_t fileObjId = 0;
- //if (TSK_ERR == addUnallocBlockFile(unallocVolObjId, 0, current_run->len * pool_info->block_size, ranges, fileObjId, m_curImgId)) {
- // registerError();
- // tsk_fs_attr_run_free(unalloc_runs);
- // return TSK_ERR;
- //}
-
current_run = current_run->next;
- ranges.clear();
}
tsk_fs_attr_run_free(unalloc_runs);
}
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 9f9d335c8..db60f7b39 100755
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -1319,21 +1319,13 @@ TSK_RETVAL_ENUM TskAutoDb::addUnallocVsSpaceToDb(size_t & numVsP) {
return TSK_ERR;
}
- //create an unalloc file with unalloc part, with vs part as parent
- //vector<TSK_DB_FILE_LAYOUT_RANGE> ranges;
+ //create an unalloc file (or files) with unalloc part, with vs part as parent
const uint64_t byteStart = vsInfo.offset + vsInfo.block_size * vsPart.start;
const uint64_t byteLen = vsInfo.block_size * vsPart.len;
if (addUnallocBlockFileInChunks(byteStart, byteLen, vsPart.objId, m_curImgId) == TSK_ERR) {
registerError();
return TSK_ERR;
}
- //TSK_DB_FILE_LAYOUT_RANGE tempRange(byteStart, byteLen, 0);
- //ranges.push_back(tempRange);
- //int64_t fileObjId = 0;
- //if (m_db->addUnallocBlockFile(vsPart.objId, 0, tempRange.byteLen, ranges, fileObjId, m_curImgId) == TSK_ERR) {
- // registerError();
- // return TSK_ERR;
- //}
}
return TSK_OK;
--
GitLab