From ce19752fae6bc382f618a34af4399d51d29ad7a8 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Fri, 15 Nov 2019 08:59:49 -0500
Subject: [PATCH] Cleanup
---
bindings/java/src/org/sleuthkit/datamodel/Pool.java | 3 +--
bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java | 3 +--
bindings/java/src/org/sleuthkit/datamodel/TskData.java | 2 +-
tsk/fs/apfs_compat.cpp | 2 +-
tsk/pool/apfs_pool_compat.cpp | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Pool.java b/bindings/java/src/org/sleuthkit/datamodel/Pool.java
index 4c3e12ff3..be2200efb 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Pool.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/Pool.java
@@ -18,7 +18,6 @@
*/
package org.sleuthkit.datamodel;
-import java.util.ArrayList;
import java.util.List;
import org.sleuthkit.datamodel.TskData.TSK_DB_POOL_TYPE_ENUM;
@@ -28,7 +27,7 @@
public class Pool extends AbstractContent {
private volatile long poolHandle = 0;
- private long type, imgOffset;
+ private final long type, imgOffset;
/**
* Constructor most inputs are from the database
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index 48d231b97..766571b19 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -7344,8 +7344,7 @@ private Pool getPoolByIdHelper(long id, Content parent) throws TskCoreException
rs = connection.executeQuery(s, "SELECT * FROM tsk_pool_info " //NON-NLS
+ "where obj_id = " + id); //NON-NLS
if (rs.next()) {
-
- Pool pool = new Pool(this, rs.getLong("obj_id"), "POOL!", rs.getLong("pool_type"), rs.getLong("img_offset"));
+ Pool pool = new Pool(this, rs.getLong("obj_id"), TskData.TSK_DB_POOL_TYPE_ENUM.valueOf(rs.getLong("pool_type")).getName(), rs.getLong("pool_type"), rs.getLong("img_offset"));
pool.setParent(parent);
return pool;
diff --git a/bindings/java/src/org/sleuthkit/datamodel/TskData.java b/bindings/java/src/org/sleuthkit/datamodel/TskData.java
index ae7263a45..aecc8d9ae 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TskData.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TskData.java
@@ -730,7 +730,7 @@ public String getName() {
*/
public enum TSK_DB_POOL_TYPE_ENUM {
TSK_POOL_TYPE_DETECT(0, "Auto detect"), ///< Use autodetection methods
- TSK_POOL_TYPE_APFS(1, "APFS"), ///< APFS Pooled Volumes
+ TSK_POOL_TYPE_APFS(1, "APFS Pool"), ///< APFS Pooled Volumes
TSK_POOL_TYPE_UNSUPP(0xffff, "Unsupported") ///< Unsupported pool container type
;
diff --git a/tsk/fs/apfs_compat.cpp b/tsk/fs/apfs_compat.cpp
index 8baee180d..03c05936a 100755
--- a/tsk/fs/apfs_compat.cpp
+++ b/tsk/fs/apfs_compat.cpp
@@ -176,7 +176,7 @@ APFSFSCompat::APFSFSCompat(TSK_IMG_INFO* img_info, const TSK_POOL_INFO* pool_inf
//_fsinfo.fs_pool_info = pool_info;
//_fsinfo.fs_vol_block = vol_block;
_fsinfo.img_info = img_info;
- _fsinfo.offset = pool.first_img_offset;
+ _fsinfo.offset = pool.first_img_offset();
_fsinfo.block_count = vol.alloc_blocks();
_fsinfo.block_size = pool.block_size();
_fsinfo.dev_bsize = pool.dev_block_size();
diff --git a/tsk/pool/apfs_pool_compat.cpp b/tsk/pool/apfs_pool_compat.cpp
index 77443f557..24f175b3c 100755
--- a/tsk/pool/apfs_pool_compat.cpp
+++ b/tsk/pool/apfs_pool_compat.cpp
@@ -300,7 +300,7 @@ apfs_img_read(TSK_IMG_INFO * img_info, TSK_OFF_T offset, char *buf, size_t len)
const auto pool = static_cast<APFSPoolCompat*>(pool_img_info->pool_info->impl);
TSK_IMG_INFO *origInfo = pool->getTSKImgInfo(0);
- return origInfo->read(origInfo, offset + pool->first_img_offset(), buf, len);
+ return origInfo->read(origInfo, offset, buf, len);
}
TSK_IMG_INFO * APFSPoolCompat::getImageInfo(const TSK_POOL_INFO *pool_info, TSK_DADDR_T pvol_block) noexcept try {
--
GitLab