diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp index c2f8512e97542e1cf5734c5689e9463764b370ce..0e616dbad8d48d72916cab90e24d121908a0ac44 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 33d571e365fa5d8a2a73ac17b2ebf59fa3129392..e283fd074fc109f7d29452c0289d3ffc2f066e94 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 c859c6411b98b9db48a8a5b448c1a3cfe23b19f7..d927272ed9110c7c53c99e3dcfe9845e53a5b01e 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);