From 6df335a23ba1b69f637a4dcd411706c0b345ca7e Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Wed, 17 Feb 2016 15:42:43 -0500
Subject: [PATCH] Remove unneeded code
---
tsk/auto/auto_db.cpp | 12 +++++-------
tsk/auto/tsk_case_db.h | 4 ++--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index e9afd7e14..a3885216a 100644
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -113,13 +113,12 @@ void TskAutoDb::setAddUnallocSpace(bool addUnallocSpace, int64_t chunkSize)
* @param a_images Array of paths to the image parts
* @param a_type Image type
* @param a_ssize Size of device sector in bytes (or 0 for default)
- * @param dataSourceObjId The object ID for the data source
* @param a_deviceId An ASCII-printable identifier for the device associated with the data source that is intended to be unique across multiple cases (e.g., a UUID).
* @return 0 for success, 1 for failure
*/
uint8_t
TskAutoDb::openImageUtf8(int a_num, const char *const a_images[],
- TSK_IMG_TYPE_ENUM a_type, unsigned int a_ssize, int64_t & dataSourceObjId, const char* a_deviceId)
+ TSK_IMG_TYPE_ENUM a_type, unsigned int a_ssize, const char* a_deviceId)
{
uint8_t retval =
TskAuto::openImageUtf8(a_num, a_images, a_type, a_ssize);
@@ -140,13 +139,12 @@ uint8_t
* @param a_images Array of paths to the image parts
* @param a_type Image type
* @param a_ssize Size of device sector in bytes (or 0 for default)
- * @param dataSourceObjId The object ID for the data source
* @param a_deviceId An ASCII-printable identifier for the device associated with the data source that is intended to be unique across multiple cases (e.g., a UUID).
* @return 0 for success, 1 for failure
*/
uint8_t
TskAutoDb::openImage(int a_num, const TSK_TCHAR * const a_images[],
- TSK_IMG_TYPE_ENUM a_type, unsigned int a_ssize, int64_t & dataSourceObjId, const char* a_deviceId)
+ TSK_IMG_TYPE_ENUM a_type, unsigned int a_ssize, const char* a_deviceId)
{
// make name of database
@@ -202,7 +200,7 @@ uint8_t
return 0;
#else
- return openImageUtf8(a_num, a_images, a_type, a_ssize, dataSourceObjId, a_deviceId);
+ return openImageUtf8(a_num, a_images, a_type, a_ssize, a_deviceId);
#endif
}
@@ -441,7 +439,7 @@ uint8_t
m_imgTransactionOpen = true;
int64_t dataSourceObjId=-1;
- if (openImage(numImg, imagePaths, imgType, sSize, dataSourceObjId, deviceId)) {
+ if (openImage(numImg, imagePaths, imgType, sSize, deviceId)) {
tsk_error_set_errstr2("TskAutoDb::startAddImage");
registerError();
if (revertAddImage())
@@ -501,7 +499,7 @@ uint8_t
m_imgTransactionOpen = true;
- if (openImageUtf8(numImg, imagePaths, imgType, sSize, dataSourceObjId, deviceId)) {
+ if (openImageUtf8(numImg, imagePaths, imgType, sSize, deviceId)) {
tsk_error_set_errstr2("TskAutoDb::startAddImage");
registerError();
if (revertAddImage())
diff --git a/tsk/auto/tsk_case_db.h b/tsk/auto/tsk_case_db.h
index 8a7ae52fb..c8b199ecb 100644
--- a/tsk/auto/tsk_case_db.h
+++ b/tsk/auto/tsk_case_db.h
@@ -36,9 +36,9 @@ class TskAutoDb:public TskAuto {
TskAutoDb(TskDb * a_db, TSK_HDB_INFO * a_NSRLDb, TSK_HDB_INFO * a_knownBadDb);
virtual ~ TskAutoDb();
virtual uint8_t openImage(int, const TSK_TCHAR * const images[],
- TSK_IMG_TYPE_ENUM, unsigned int a_ssize, int64_t & dataSourceObjId, const char* deviceId = NULL);
+ TSK_IMG_TYPE_ENUM, unsigned int a_ssize, const char* deviceId = NULL);
virtual uint8_t openImageUtf8(int, const char *const images[],
- TSK_IMG_TYPE_ENUM, unsigned int a_ssize, int64_t & dataSourceObjId, const char* deviceId = NULL);
+ TSK_IMG_TYPE_ENUM, unsigned int a_ssize, const char* deviceId = NULL);
virtual void closeImage();
virtual void setTz(string tzone);
--
GitLab