From 3b04cc3061ba62627e3f47893c9e52ca64db19c8 Mon Sep 17 00:00:00 2001
From: "Samuel H. Kenyon" <skenyon@basistech.com>
Date: Wed, 13 Nov 2013 13:31:11 -0500
Subject: [PATCH] More renaming of JNI native functions for internal
 consistency.

---
 bindings/java/jni/dataModel_SleuthkitJNI.cpp  | 14 +++++------
 bindings/java/jni/dataModel_SleuthkitJNI.h    | 24 +++++++++----------
 .../org/sleuthkit/datamodel/SleuthkitJNI.java | 24 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
index 166426962..48a0ea0e1 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
@@ -497,7 +497,7 @@ JNIEXPORT jstring JNICALL
  * @return true if index only AND is legacy
  */
 JNIEXPORT jboolean JNICALL
-    Java_org_sleuthkit_datamodel_SleuthkitJNI_isIdxOnlyHashDbNat(JNIEnv * env,
+    Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbIsIdxOnlyNat(JNIEnv * env,
     jclass obj, jint dbHandle)
 {
     bool retval = false;
@@ -521,7 +521,7 @@ JNIEXPORT jboolean JNICALL
  * @param obj the java object this was called from
  * @param dbHandle Which DB.
  */
-JNIEXPORT jstring JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_getDbName
+JNIEXPORT jstring JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbGetName
   (JNIEnv * env, jclass obj, jint dbHandle)
 {
     if((size_t) dbHandle > m_hashDbs.size()) {
@@ -548,7 +548,7 @@ JNIEXPORT jstring JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_getDbName
  * @param dbHandle Which DB.
  */
 JNIEXPORT void JNICALL
-    Java_org_sleuthkit_datamodel_SleuthkitJNI_closeAllDbLookupsNat(JNIEnv * env,
+    Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbCloseAll(JNIEnv * env,
     jclass obj) {
 
     for_each(m_hashDbs.begin(), m_hashDbs.end(), tsk_hdb_close);
@@ -566,7 +566,7 @@ JNIEXPORT void JNICALL
  * @param dbHandle Which DB.
  */
 JNIEXPORT void JNICALL
-    Java_org_sleuthkit_datamodel_SleuthkitJNI_closeDbLookupNat(JNIEnv * env,
+    Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbClose(JNIEnv * env,
     jclass obj, jint dbHandle) {
 
     if((size_t) dbHandle > m_hashDbs.size()) {
@@ -1546,7 +1546,7 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_startVerboseLoggingNat
  * @param dbHandle handle for the database
  */
 JNIEXPORT void JNICALL
-Java_org_sleuthkit_datamodel_SleuthkitJNI_createLookupIndexNat (JNIEnv * env,
+Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbCreateIndexNat (JNIEnv * env,
     jclass obj, jint dbHandle, jboolean overwrite)
 {
     if((size_t) dbHandle > m_hashDbs.size()) {
@@ -1591,12 +1591,12 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_createLookupIndexNat (JNIEnv * env,
 
 
 /*
- * Check if an index exists for the given database.
+ * Check if a lookup index exists for the given hash database.
  * @param env pointer to java environment this was called from
  * @param obj the java object this was called from
  * @param dbHandle handle for the database
  */
-JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_lookupIndexExistsNat
+JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbIndexExistsNat
   (JNIEnv * env, jclass obj, jint dbHandle) {
 
     if((size_t) dbHandle > m_hashDbs.size()) {
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.h b/bindings/java/jni/dataModel_SleuthkitJNI.h
index 6dabe8a16..cab72fffc 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.h
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.h
@@ -86,11 +86,11 @@ JNIEXPORT jboolean JNICALL
 
 /*
  * Class:     org_sleuthkit_datamodel_SleuthkitJNI
- * Method:    isIdxOnlyHashDbNat
+ * Method:    hashDbIsIdxOnlyNat
  * Signature: 
  */
 JNIEXPORT jboolean JNICALL
-    Java_org_sleuthkit_datamodel_SleuthkitJNI_isIdxOnlyHashDbNat(JNIEnv * env,
+    Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbIsIdxOnlyNat(JNIEnv * env,
     jclass obj, jint dbHandle);
 
 /*
@@ -122,26 +122,26 @@ JNIEXPORT jstring JNICALL
 
 /*
  * Class:     org_sleuthkit_datamodel_SleuthkitJNI
- * Method:    getHashDbName
+ * Method:    hashDbGetName
  * Signature: 
  */
-JNIEXPORT jstring JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_getDbName
+JNIEXPORT jstring JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbGetName
   (JNIEnv *, jclass, jint dbHandle);
 
 /*
  * Class:     org_sleuthkit_datamodel_SleuthkitJNI
- * Method:    closeAllDbLookupsNat
+ * Method:    hashDbCloseAll
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_closeAllDbLookupsNat
+JNIEXPORT void JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbCloseAll
   (JNIEnv *, jclass);
 
 /*
  * Class:     org_sleuthkit_datamodel_SleuthkitJNI
- * Method:    closeDbLookupNat
+ * Method:    hashDbClose
  * Signature: 
  */
-JNIEXPORT void JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_closeDbLookupNat
+JNIEXPORT void JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbClose
   (JNIEnv *, jclass, jint dbHandle);
 
 /*
@@ -316,18 +316,18 @@ JNIEXPORT void JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_closeFileNat
 
 /*
  * Class:     org_sleuthkit_datamodel_SleuthkitJNI
- * Method:    createLookupIndexNat
+ * Method:    hashDbCreateIndexNat
  * Signature: 
  */
-JNIEXPORT void JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_createLookupIndexNat
+JNIEXPORT void JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbCreateIndexNat
   (JNIEnv *, jclass, jint, jboolean);
 
 /*
  * Class:     org_sleuthkit_datamodel_SleuthkitJNI
- * Method:    lookupIndexExistsNat
+ * Method:    hashDbIndexExistsNat
  * Signature: 
  */
-JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_lookupIndexExistsNat
+JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbIndexExistsNat
   (JNIEnv *, jclass, jint);
 
 /*
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
index c8f46f98c..99b21087a 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
@@ -64,18 +64,18 @@ public class SleuthkitJNI {
     
     private static native String hashDbIndexPathNat(int dbHandle);
         
-    private static native String getDbName(int dbHandle) throws TskCoreException;
+    private static native String hashDbGetName(int dbHandle) throws TskCoreException;
 
-	private static native void closeAllDbLookupsNat() throws TskCoreException;
+	private static native void hashDbCloseAll() throws TskCoreException;
     
-    private static native void closeDbLookupNat(int dbHandle) throws TskCoreException;
+    private static native void hashDbClose(int dbHandle) throws TskCoreException;
 
 	//hash-lookup database functions   
-    private static native void createLookupIndexNat(int dbHandle, boolean overwrite) throws TskCoreException;
+    private static native void hashDbCreateIndexNat(int dbHandle, boolean overwrite) throws TskCoreException;
     
-    private static native boolean lookupIndexExistsNat(int dbHandle) throws TskCoreException;
+    private static native boolean hashDbIndexExistsNat(int dbHandle) throws TskCoreException;
 
-    private static native boolean isIdxOnlyHashDbNat(int dbHandle) throws TskCoreException;
+    private static native boolean hashDbIsIdxOnlyNat(int dbHandle) throws TskCoreException;
     
 	private static native int hashDbLookup(String hash, int dbHandle) throws TskCoreException;            
 
@@ -569,7 +569,7 @@ public static void closeFile(long fileHandle) {
 	 * @throws TskCoreException if a critical error occurs within TSK core
 	 */
 	public static void createLookupIndexForHashDatabase(int dbHandle, boolean overwrite) throws TskCoreException {
-		createLookupIndexNat(dbHandle, overwrite);
+		hashDbCreateIndexNat(dbHandle, overwrite);
 	}    
     
    
@@ -581,7 +581,7 @@ public static void createLookupIndexForHashDatabase(int dbHandle, boolean overwr
 	 * @throws TskCoreException if a critical error occurs within TSK core
 	 */
 	public static boolean hashDatabaseHasLookupIndex(int dbHandle) throws TskCoreException {
-		return lookupIndexExistsNat(dbHandle);
+		return hashDbIndexExistsNat(dbHandle);
 	}    
     
 	/**
@@ -641,7 +641,7 @@ public static int createHashDatabase(String path) throws TskCoreException {
 	 * within TSK
 	 */
 	public static void closeAllHashDatabases() throws TskCoreException {
-		closeAllDbLookupsNat();
+		hashDbCloseAll();
 	}
 
 	/**
@@ -651,7 +651,7 @@ public static void closeAllHashDatabases() throws TskCoreException {
 	 * within TSK
 	 */
 	public static void closeHashDatabase(int dbHandle) throws TskCoreException {
-		closeDbLookupNat(dbHandle);
+		hashDbClose(dbHandle);
 	}
 
 	
@@ -662,7 +662,7 @@ public static void closeHashDatabase(int dbHandle) throws TskCoreException {
 	 * @throws TskCoreException if a critical error occurs within TSK core
 	 */
 	public static String getHashDatabaseName(int dbHandle) throws TskCoreException {
-		return getDbName(dbHandle);
+		return hashDbGetName(dbHandle);
 	}
     
     
@@ -689,7 +689,7 @@ public static boolean isUpdateableHashDatabase(int dbHandle) throws TskCoreExcep
 	}    
     
     public static boolean hashDatabaseHasLegacyLookupIndexOnly(int dbHandle) throws TskCoreException {
-        return isIdxOnlyHashDbNat(dbHandle);
+        return hashDbIsIdxOnlyNat(dbHandle);
     }
     
 
-- 
GitLab