From 5b0859a6b5423f2e2f9df0c3fb2e14b551e017e0 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Mon, 8 Jun 2020 10:31:02 -0400
Subject: [PATCH] Removed unnecessary addImageName method
---
bindings/java/jni/auto_db_java.cpp | 28 -------------------
.../org/sleuthkit/datamodel/JniDbHelper.java | 24 ----------------
2 files changed, 52 deletions(-)
diff --git a/bindings/java/jni/auto_db_java.cpp b/bindings/java/jni/auto_db_java.cpp
index eb009c7d3..29043b25e 100644
--- a/bindings/java/jni/auto_db_java.cpp
+++ b/bindings/java/jni/auto_db_java.cpp
@@ -84,11 +84,6 @@ TskAutoDbJava::initializeJni(JNIEnv * jniEnv, jobject jobj) {
return TSK_ERR;
}
- m_addImageNameMethodID = m_jniEnv->GetMethodID(m_callbackClass, "addImageName", "(JLjava/lang/String;J)I");
- if (m_addImageNameMethodID == NULL) {
- return TSK_ERR;
- }
-
m_addVolumeSystemMethodID = m_jniEnv->GetMethodID(m_callbackClass, "addVsInfo", "(JIJJ)J");
if (m_addVolumeSystemMethodID == NULL) {
return TSK_ERR;
@@ -227,29 +222,6 @@ TskAutoDbJava::addImageInfo(int type, TSK_OFF_T ssize, int64_t & objId, const st
return TSK_OK;
}
-/**
-* Adds one image name
-* @param objId The object ID of the image
-* @param imgName The image name
-* @param sequence The sequence number for this image name
-* @returns TSK_ERR on error, TSK_OK on success
-*/
-TSK_RETVAL_ENUM
-TskAutoDbJava::addImageName(int64_t objId, char const* imgName, int sequence) {
-
- jstring imgNamej = m_jniEnv->NewStringUTF(imgName);
-
- jint res = m_jniEnv->CallIntMethod(m_javaDbObj, m_addImageNameMethodID,
- objId, imgNamej, (int64_t)sequence);
-
- if (res == 0) {
- return TSK_OK;
- }
- else {
- return TSK_ERR;
- }
-}
-
/**
* Adds volume system to database. Object ID for new vs stored in objId.
*
diff --git a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
index 5d61e57c7..a282d8d41 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
@@ -134,30 +134,6 @@ long addImageInfo(int type, long ssize, String timezone,
}
}
- /**
- * Add an image name to the database.
- * Intended to be called from the native code during the add image process.
- *
- * @param objId The object id of the image.
- * @param name The file name for the image
- * @param sequence The sequence number of this file.
- *
- * @return 0 if successful, -1 if not
- */
- int addImageName(long objId, String name, long sequence) {
- try {
- beginTransaction();
- caseDb.addImageNameJNI(objId, name, sequence, trans);
- commitTransaction();
- return 0;
- } catch (TskCoreException ex) {
- logger.log(Level.SEVERE, "Error adding image name to the database - image obj ID: " + objId + ", image name: " + name
- + ", sequence: " + sequence, ex);
- revertTransaction();
- return -1;
- }
- }
-
/**
* Add a volume system to the database.
* Intended to be called from the native code during the add image process.
--
GitLab