From 0b3d8218f64ae87b2712ae7fa9d1801845e16a9a Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Mon, 10 Feb 2014 11:56:21 -0500
Subject: [PATCH] Reformat some hashdb code
---
bindings/java/jni/dataModel_SleuthkitJNI.cpp | 24 +++++++++----------
bindings/java/jni/dataModel_SleuthkitJNI.h | 6 ++---
.../org/sleuthkit/datamodel/HashEntry.java | 10 ++++----
.../org/sleuthkit/datamodel/SleuthkitJNI.java | 4 ++--
tsk/hashdb/sqlite_hdb.cpp | 8 +++----
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
index 3d17438dc..6e05f3059 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
@@ -320,15 +320,15 @@ JNIEXPORT jint JNICALL
*/
JNIEXPORT jint JNICALL
Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbBeginTransactionNat(
- JNIEnv * env, jclass obj, jint dbHandle)
+ JNIEnv *env, jclass obj, jint dbHandle)
{
- if((size_t) dbHandle > hashDbs.size()) {
+ if((size_t)dbHandle > hashDbs.size()) {
setThrowTskCoreError(env, "Invalid database handle");
return 1;
}
- TSK_HDB_INFO * db = hashDbs.at(dbHandle-1);
- if(!db) {
+ TSK_HDB_INFO *db = hashDbs.at(dbHandle - 1);
+ if (!db) {
setThrowTskCoreError(env, "Invalid database handle");
return 1;
}
@@ -345,15 +345,15 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbBeginTransactionNat(
*/
JNIEXPORT jint JNICALL
Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbCommitTransactionNat(
- JNIEnv * env, jclass obj, jint dbHandle)
+ JNIEnv *env, jclass obj, jint dbHandle)
{
- if((size_t) dbHandle > hashDbs.size()) {
+ if((size_t)dbHandle > hashDbs.size()) {
setThrowTskCoreError(env, "Invalid database handle");
return 1;
}
- TSK_HDB_INFO * db = hashDbs.at(dbHandle-1);
- if(!db) {
+ TSK_HDB_INFO *db = hashDbs.at(dbHandle - 1);
+ if (!db) {
setThrowTskCoreError(env, "Invalid database handle");
return 1;
}
@@ -370,15 +370,15 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbCommitTransactionNat(
*/
JNIEXPORT jint JNICALL
Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbRollbackTransactionNat(
- JNIEnv * env, jclass obj, jint dbHandle)
+ JNIEnv *env, jclass obj, jint dbHandle)
{
- if((size_t) dbHandle > hashDbs.size()) {
+ if((size_t)dbHandle > hashDbs.size()) {
setThrowTskCoreError(env, "Invalid database handle");
return 1;
}
- TSK_HDB_INFO * db = hashDbs.at(dbHandle-1);
- if(!db) {
+ TSK_HDB_INFO *db = hashDbs.at(dbHandle-1);
+ if (!db) {
setThrowTskCoreError(env, "Invalid database handle");
return 1;
}
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.h b/bindings/java/jni/dataModel_SleuthkitJNI.h
index bfdd3eb45..03c3ad831 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.h
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.h
@@ -67,15 +67,15 @@ JNIEXPORT jint JNICALL
JNIEXPORT jint JNICALL
Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbBeginTransactionNat(
- JNIEnv * env, jclass obj, jint dbHandle);
+ JNIEnv *env, jclass obj, jint dbHandle);
JNIEXPORT jint JNICALL
Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbCommitTransactionNat(
- JNIEnv * env, jclass obj, jint dbHandle);
+ JNIEnv *env, jclass obj, jint dbHandle);
JNIEXPORT jint JNICALL
Java_org_sleuthkit_datamodel_SleuthkitJNI_hashDbRollbackTransactionNat(
- JNIEnv * env, jclass obj, jint dbHandle);
+ JNIEnv *env, jclass obj, jint dbHandle);
/*
* Class: org_sleuthkit_datamodel_SleuthkitJNI
diff --git a/bindings/java/src/org/sleuthkit/datamodel/HashEntry.java b/bindings/java/src/org/sleuthkit/datamodel/HashEntry.java
index fa1459f01..781a6ac54 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/HashEntry.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/HashEntry.java
@@ -22,10 +22,10 @@
* Used to pass hashDb information about a particular file from TSK to Autopsy
*/
public class HashEntry {
+ private String fileName;
private String md5Hash;
private String sha1Hash;
private String sha256Hash;
- private String fileName;
private String comment;
public HashEntry(String fileName, String md5Hash, String sha1Hash, String sha256Hash, String comment) {
@@ -36,6 +36,10 @@ public HashEntry(String fileName, String md5Hash, String sha1Hash, String sha256
this.comment = comment;
}
+ public String getFileName() {
+ return fileName;
+ }
+
public String getMd5Hash() {
return md5Hash;
}
@@ -48,10 +52,6 @@ public String getSha256Hash() {
return sha256Hash;
}
- public String getFileName() {
- return fileName;
- }
-
public String getComment() {
return comment;
}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
index f35c73ad4..62d800738 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
@@ -56,9 +56,9 @@ public class SleuthkitJNI {
private static native int hashDbNewNat(String hashDbPath) throws TskCoreException;
private static native int hashDbBeginTransactionNat(int dbHandle) throws TskCoreException;
-
+
private static native int hashDbCommitTransactionNat(int dbHandle) throws TskCoreException;
-
+
private static native int hashDbRollbackTransactionNat(int dbHandle) throws TskCoreException;
private static native int hashDbAddEntryNat(String filename, String hashMd5, String hashSha1, String hashSha256, String comment, int dbHandle) throws TskCoreException;
diff --git a/tsk/hashdb/sqlite_hdb.cpp b/tsk/hashdb/sqlite_hdb.cpp
index c5bb2026e..e57ada9c2 100644
--- a/tsk/hashdb/sqlite_hdb.cpp
+++ b/tsk/hashdb/sqlite_hdb.cpp
@@ -669,7 +669,7 @@ uint8_t sqlite_hdb_begin_transaction(TSK_HDB_INFO *hdb_info_base)
TSK_SQLITE_HDB_INFO *hdb_info = reinterpret_cast<TSK_SQLITE_HDB_INFO*>(hdb_info_base);
if (sqlite_hdb_attempt_exec("BEGIN", "sqlite_hdb_base_begin_transaction: %s\n", hdb_info->db)) {
return 1;
- }
+ }
else {
return 0;
}
@@ -685,9 +685,9 @@ uint8_t sqlite_hdb_begin_transaction(TSK_HDB_INFO *hdb_info_base)
uint8_t sqlite_hdb_commit_transaction(TSK_HDB_INFO *hdb_info_base)
{
TSK_SQLITE_HDB_INFO *hdb_info = reinterpret_cast<TSK_SQLITE_HDB_INFO*>(hdb_info_base);
- if (sqlite_hdb_attempt_exec("COMMIT", "sqlite_hdb_base_end_transaction: %s\n", hdb_info->db)) {
+ if (sqlite_hdb_attempt_exec("COMMIT", "sqlite_hdb_commit_transaction: %s\n", hdb_info->db)) {
return 1;
- }
+ }
else {
return 0;
}
@@ -703,7 +703,7 @@ uint8_t sqlite_hdb_commit_transaction(TSK_HDB_INFO *hdb_info_base)
uint8_t sqlite_hdb_rollback_transaction(TSK_HDB_INFO *hdb_info_base)
{
TSK_SQLITE_HDB_INFO *hdb_info = reinterpret_cast<TSK_SQLITE_HDB_INFO*>(hdb_info_base);
- if (sqlite_hdb_attempt_exec("ROLLBACK", "sqlite_hdb_base_end_transaction: %s\n", hdb_info->db)) {
+ if (sqlite_hdb_attempt_exec("ROLLBACK", "sqlite_hdb_rollback_transaction: %s\n", hdb_info->db)) {
return 1;
}
else {
--
GitLab