From 3b3bf48b8e879284cbef47fa569f87963eb6be82 Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Tue, 8 Nov 2016 12:18:33 -0500
Subject: [PATCH] Move TSK_FS_FILE_READ_OFFSET_TYPE_ENUM into JNI code
---
bindings/java/jni/dataModel_SleuthkitJNI.cpp | 8 ++++++++
bindings/java/jni/dataModel_SleuthkitJNI.h | 11 +++++++++++
tsk/fs/tsk_fs.h | 8 --------
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
index c2f8512e9..0e616dbad 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
@@ -1672,6 +1672,14 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_readFsNat(JNIEnv * env,
}
+/**
+ * Flag used by readFileNat to specify if the offset is relative to the start of the file
+ * or the start of the slack space
+ */
+typedef enum {
+ TSK_FS_FILE_READ_OFFSET_TYPE_START_OF_FILE = 0x00,
+ TSK_FS_FILE_READ_OFFSET_TYPE_START_OF_SLACK = 0x01,
+} TSK_FS_FILE_READ_OFFSET_TYPE_ENUM;
/*
* Read bytes from the given file
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.h b/bindings/java/jni/dataModel_SleuthkitJNI.h
index 33d571e36..e283fd074 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.h
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.h
@@ -399,6 +399,17 @@ JNIEXPORT jstring JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_getCurDirNat
JNIEXPORT jboolean JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_isImageSupportedNat
(JNIEnv *, jclass, jstring);
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class org_sleuthkit_datamodel_SleuthkitJNI_TSK_FS_FILE_READ_OFFSET_TYPE_ENUM */
+
+#ifndef _Included_org_sleuthkit_datamodel_SleuthkitJNI_TSK_FS_FILE_READ_OFFSET_TYPE_ENUM
+#define _Included_org_sleuthkit_datamodel_SleuthkitJNI_TSK_FS_FILE_READ_OFFSET_TYPE_ENUM
+#ifdef __cplusplus
+extern "C" {
+#endif
#ifdef __cplusplus
}
#endif
diff --git a/tsk/fs/tsk_fs.h b/tsk/fs/tsk_fs.h
index c859c6411..d927272ed 100644
--- a/tsk/fs/tsk_fs.h
+++ b/tsk/fs/tsk_fs.h
@@ -690,14 +690,6 @@ extern "C" {
TSK_FS_FILE_READ_FLAG_NOID = 0x02, ///< Ignore the Id argument given in the API (use only the type)
} TSK_FS_FILE_READ_FLAG_ENUM;
- /**
- * Flag used by readFileNat to specify if the offset is relative to the start of the file
- * or the start of the slack space */
- typedef enum {
- TSK_FS_FILE_READ_OFFSET_TYPE_START_OF_FILE = 0x00,
- TSK_FS_FILE_READ_OFFSET_TYPE_START_OF_SLACK = 0x01,
- } TSK_FS_FILE_READ_OFFSET_TYPE_ENUM;
-
extern void tsk_fs_file_close(TSK_FS_FILE * a_fs_file);
extern TSK_FS_FILE *tsk_fs_file_open(TSK_FS_INFO * a_fs,
TSK_FS_FILE * a_fs_file, const char *a_path);
--
GitLab