From 0e5e54292f87ef24a1ae2103715349d6a0b6ea07 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Thu, 31 Aug 2017 12:10:28 -0400
Subject: [PATCH] Remove enabled flag from setAddUnallocSpace
---
bindings/java/jni/dataModel_SleuthkitJNI.cpp | 2 +-
tsk/auto/auto_db.cpp | 8 +++++---
tsk/auto/tsk_case_db.h | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
index b1e24a044..e51d1ab7b 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
@@ -1016,7 +1016,7 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_initializeAddImgNat(JNIEnv * env, jcla
if (addFileSystems) {
if (addUnallocSpace) {
// Minimum size of unalloc files: 500 MB, maximum size: 1 GB
- tskAuto->setAddUnallocSpace(true, 500 * 1024 * 1024, 1024 * 1024 * 1024);
+ tskAuto->setAddUnallocSpace((int64_t)500 * 1024 * 1024, (int64_t)1024 * 1024 * 1024);
}
else {
tskAuto->setAddUnallocSpace(false);
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index fefe5830d..4a1a649d1 100644
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -110,12 +110,14 @@ void TskAutoDb::setAddUnallocSpace(bool addUnallocSpace)
void TskAutoDb::setAddUnallocSpace(bool addUnallocSpace, int64_t minChunkSize)
{
- setAddUnallocSpace(addUnallocSpace, minChunkSize, -1);
+ m_addUnallocSpace = addUnallocSpace;
+ m_minChunkSize = minChunkSize;
+ m_maxChunkSize = -1;
}
-void TskAutoDb::setAddUnallocSpace(bool addUnallocSpace, int64_t minChunkSize, int64_t maxChunkSize)
+void TskAutoDb::setAddUnallocSpace(int64_t minChunkSize, int64_t maxChunkSize)
{
- m_addUnallocSpace = addUnallocSpace;
+ m_addUnallocSpace = true;
m_minChunkSize = minChunkSize;
m_maxChunkSize = maxChunkSize;
}
diff --git a/tsk/auto/tsk_case_db.h b/tsk/auto/tsk_case_db.h
index c1882d079..74b00b6c8 100644
--- a/tsk/auto/tsk_case_db.h
+++ b/tsk/auto/tsk_case_db.h
@@ -95,15 +95,15 @@ class TskAutoDb:public TskAuto {
virtual void setAddUnallocSpace(bool addUnallocSpace, int64_t minChunkSize);
/**
- * When enabled, records for unallocated file system space will be added to the database. Default value is false.
- * @param addUnallocSpace If true, create records for contiguous unallocated file system sectors.
+ * When enabled, records for unallocated file system space will be added to the database with the given parameters.
+ * Automatically sets the flag to create records for contiguous unallocated file system sectors.
* @param minChunkSize the number of bytes to group unallocated data into. A value of 0 will create
* one large chunk and group only on volume boundaries. A value of -1 will group each consecutive
* chunk.
* @param maxChunkSize the maximum number of bytes in one record of unallocated data. A value of -1 will not
* split the records based on size
*/
- virtual void setAddUnallocSpace(bool addUnallocSpace, int64_t minChunkSize, int64_t maxChunkSize);
+ virtual void setAddUnallocSpace(int64_t minChunkSize, int64_t maxChunkSize);
uint8_t addFilesInImgToDb();
--
GitLab