From bc9bca76f3632c53d9e8cfd3db1f694dec3d973a Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Wed, 17 Feb 2016 16:57:50 -0500
Subject: [PATCH] Untabify files
---
tsk/auto/auto_db.cpp | 116 ++++++++++++++++++-------------------
tsk/auto/db_postgresql.cpp | 40 ++++++-------
tsk/auto/db_sqlite.cpp | 24 ++++----
tsk/auto/tsk_auto.h | 2 +-
tsk/auto/tsk_case_db.h | 32 +++++-----
5 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 134c87a86..7dcd7b89f 100644
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -55,7 +55,7 @@ TskAutoDb::TskAutoDb(TskDb * a_db, TSK_HDB_INFO * a_NSRLDb, TSK_HDB_INFO * a_kno
m_fileHashFlag = false;
m_noFatFsOrphans = false;
m_addUnallocSpace = false;
- m_chunkSize = -1;
+ m_chunkSize = -1;
tsk_init_lock(&m_curDirPathLock);
}
@@ -103,7 +103,7 @@ void TskAutoDb::setAddUnallocSpace(bool addUnallocSpace)
void TskAutoDb::setAddUnallocSpace(bool addUnallocSpace, int64_t chunkSize)
{
m_addUnallocSpace = addUnallocSpace;
- m_chunkSize = chunkSize;
+ m_chunkSize = chunkSize;
}
/**
@@ -197,7 +197,7 @@ uint8_t
free(img_ptrs[i]);
}
free(img_ptrs);
-
+
return 0;
#else
return openImageUtf8(a_num, a_images, a_type, a_ssize, a_deviceId);
@@ -337,7 +337,7 @@ TSK_RETVAL_ENUM
const TSK_DB_FILES_KNOWN_ENUM known)
{
if (m_db->addFsFile(fs_file, fs_attr, path, md5, known, m_curFsId, m_curFileId,
- m_curImgId)) {
+ m_curImgId)) {
registerError();
return TSK_ERR;
}
@@ -447,7 +447,7 @@ uint8_t
return 1;
}
- return addFilesInImgToDb();
+ return addFilesInImgToDb();
}
@@ -601,7 +601,7 @@ TSK_RETVAL_ENUM
TskAutoDb::processFile(TSK_FS_FILE * fs_file, const char *path)
{
- // Check if the process has been canceled
+ // Check if the process has been canceled
if (m_stopped) {
if (tsk_verbose)
tsk_fprintf(stderr, "TskAutoDb::processFile: Stop request detected\n");
@@ -633,7 +633,7 @@ TskAutoDb::processFile(TSK_FS_FILE * fs_file, const char *path)
// insert a general row if we didn't add a specific attribute one
if ((retval == TSK_OK) && (m_attributeAdded == false)) {
- retval = insertFileData(fs_file, NULL, path, NULL, TSK_DB_FILES_KNOWN_UNKNOWN);
+ retval = insertFileData(fs_file, NULL, path, NULL, TSK_DB_FILES_KNOWN_UNKNOWN);
}
// reset the file id
@@ -651,7 +651,7 @@ TSK_RETVAL_ENUM
TskAutoDb::processAttribute(TSK_FS_FILE * fs_file,
const TSK_FS_ATTR * fs_attr, const char *path)
{
- // add the file metadata for the default attribute type
+ // add the file metadata for the default attribute type
if (isDefaultType(fs_file, fs_attr)) {
// calculate the MD5 hash if the attribute is a file
@@ -661,7 +661,7 @@ TskAutoDb::processAttribute(TSK_FS_FILE * fs_file,
TSK_DB_FILES_KNOWN_ENUM file_known = TSK_DB_FILES_KNOWN_UNKNOWN;
- if (m_fileHashFlag && isFile(fs_file)) {
+ if (m_fileHashFlag && isFile(fs_file)) {
if (md5HashAttr(hash, fs_attr)) {
// error was registered
return TSK_OK;
@@ -691,7 +691,7 @@ TskAutoDb::processAttribute(TSK_FS_FILE * fs_file,
}
}
- if (insertFileData(fs_attr->fs_file, fs_attr, path, md5, file_known) == TSK_ERR) {
+ if (insertFileData(fs_attr->fs_file, fs_attr, path, md5, file_known) == TSK_ERR) {
registerError();
return TSK_OK;
}
@@ -714,7 +714,7 @@ TskAutoDb::processAttribute(TSK_FS_FILE * fs_file,
// @@@ We probaly want to keep on going here
if (m_db->addFileLayoutRange(m_curFileId,
- run->addr * block_size, run->len * block_size, sequence++)) {
+ run->addr * block_size, run->len * block_size, sequence++)) {
registerError();
return TSK_OK;
}
@@ -782,55 +782,55 @@ TSK_WALK_RET_ENUM TskAutoDb::fsWalkUnallocBlocksCb(const TSK_FS_BLOCK *a_block,
if (unallocBlockWlkTrack->tskAutoDb.m_stopAllProcessing)
return TSK_WALK_STOP;
- // initialize if this is the first block
+ // initialize if this is the first block
if (unallocBlockWlkTrack->isStart) {
unallocBlockWlkTrack->isStart = false;
unallocBlockWlkTrack->curRangeStart = a_block->addr;
unallocBlockWlkTrack->prevBlock = a_block->addr;
- unallocBlockWlkTrack->size = 0;
+ unallocBlockWlkTrack->size = 0;
unallocBlockWlkTrack->nextSequenceNo = 0;
- return TSK_WALK_CONT;
+ return TSK_WALK_CONT;
+ }
+
+ // if this block is consecutive with the previous one, update prevBlock and return
+ if (a_block->addr == unallocBlockWlkTrack->prevBlock + 1) {
+ unallocBlockWlkTrack->prevBlock = a_block->addr;
+ return TSK_WALK_CONT;
}
- // if this block is consecutive with the previous one, update prevBlock and return
- if (a_block->addr == unallocBlockWlkTrack->prevBlock + 1) {
- unallocBlockWlkTrack->prevBlock = a_block->addr;
- return TSK_WALK_CONT;
- }
-
- // this block is not contiguous with the previous one; create and add a range object
- const uint64_t rangeStartOffset = unallocBlockWlkTrack->curRangeStart * unallocBlockWlkTrack->fsInfo.block_size
- + unallocBlockWlkTrack->fsInfo.offset;
- const uint64_t rangeSizeBytes = (1 + unallocBlockWlkTrack->prevBlock - unallocBlockWlkTrack->curRangeStart)
- * unallocBlockWlkTrack->fsInfo.block_size;
- unallocBlockWlkTrack->ranges.push_back(TSK_DB_FILE_LAYOUT_RANGE(rangeStartOffset, rangeSizeBytes, unallocBlockWlkTrack->nextSequenceNo++));
-
- // bookkeeping for the next range object
- unallocBlockWlkTrack->size += rangeSizeBytes;
- unallocBlockWlkTrack->curRangeStart = a_block->addr;
- unallocBlockWlkTrack->prevBlock = a_block->addr;
-
- // Here we just return if we are a) collecting all unallocated data
- // for the given volumen (chunkSize == 0) or b) collecting all unallocated
- // data whose total size is at least chunkSize (chunkSize > 0)
- if ((unallocBlockWlkTrack->chunkSize == 0) ||
- ((unallocBlockWlkTrack->chunkSize > 0) &&
- (unallocBlockWlkTrack->size < unallocBlockWlkTrack->chunkSize))) {
- return TSK_WALK_CONT;
- }
-
- // at this point we are either chunking and have reached the chunk limit
- // or we're not chunking. Either way we now add what we've got to the DB
- int64_t fileObjId = 0;
- if (unallocBlockWlkTrack->tskAutoDb.m_db->addUnallocBlockFile(unallocBlockWlkTrack->tskAutoDb.m_curUnallocDirId,
- unallocBlockWlkTrack->fsObjId, unallocBlockWlkTrack->size, unallocBlockWlkTrack->ranges, fileObjId, ((TskAutoDb*)a_ptr)->m_curImgId) == TSK_ERR) {
+ // this block is not contiguous with the previous one; create and add a range object
+ const uint64_t rangeStartOffset = unallocBlockWlkTrack->curRangeStart * unallocBlockWlkTrack->fsInfo.block_size
+ + unallocBlockWlkTrack->fsInfo.offset;
+ const uint64_t rangeSizeBytes = (1 + unallocBlockWlkTrack->prevBlock - unallocBlockWlkTrack->curRangeStart)
+ * unallocBlockWlkTrack->fsInfo.block_size;
+ unallocBlockWlkTrack->ranges.push_back(TSK_DB_FILE_LAYOUT_RANGE(rangeStartOffset, rangeSizeBytes, unallocBlockWlkTrack->nextSequenceNo++));
+
+ // bookkeeping for the next range object
+ unallocBlockWlkTrack->size += rangeSizeBytes;
+ unallocBlockWlkTrack->curRangeStart = a_block->addr;
+ unallocBlockWlkTrack->prevBlock = a_block->addr;
+
+ // Here we just return if we are a) collecting all unallocated data
+ // for the given volumen (chunkSize == 0) or b) collecting all unallocated
+ // data whose total size is at least chunkSize (chunkSize > 0)
+ if ((unallocBlockWlkTrack->chunkSize == 0) ||
+ ((unallocBlockWlkTrack->chunkSize > 0) &&
+ (unallocBlockWlkTrack->size < unallocBlockWlkTrack->chunkSize))) {
+ return TSK_WALK_CONT;
+ }
+
+ // at this point we are either chunking and have reached the chunk limit
+ // or we're not chunking. Either way we now add what we've got to the DB
+ int64_t fileObjId = 0;
+ if (unallocBlockWlkTrack->tskAutoDb.m_db->addUnallocBlockFile(unallocBlockWlkTrack->tskAutoDb.m_curUnallocDirId,
+ unallocBlockWlkTrack->fsObjId, unallocBlockWlkTrack->size, unallocBlockWlkTrack->ranges, fileObjId, ((TskAutoDb*)a_ptr)->m_curImgId) == TSK_ERR) {
// @@@ Handle error -> Don't have access to registerError() though...
}
- // reset
- unallocBlockWlkTrack->curRangeStart = a_block->addr;
- unallocBlockWlkTrack->size = 0;
- unallocBlockWlkTrack->ranges.clear();
+ // reset
+ unallocBlockWlkTrack->curRangeStart = a_block->addr;
+ unallocBlockWlkTrack->size = 0;
+ unallocBlockWlkTrack->ranges.clear();
unallocBlockWlkTrack->nextSequenceNo = 0;
//we don't know what the last unalloc block is in advance
@@ -856,7 +856,7 @@ TSK_RETVAL_ENUM TskAutoDb::addFsInfoUnalloc(const TSK_DB_FS_INFO & dbFsInfo) {
}
//create a "fake" dir to hold the unalloc files for the fs
- if (m_db->addUnallocFsBlockFilesParent(dbFsInfo.objId, m_curUnallocDirId, m_curImgId) == TSK_ERR) {
+ if (m_db->addUnallocFsBlockFilesParent(dbFsInfo.objId, m_curUnallocDirId, m_curImgId) == TSK_ERR) {
tsk_error_set_errstr2("addFsInfoUnalloc: error creating dir for unallocated space");
registerError();
return TSK_ERR;
@@ -864,7 +864,7 @@ TSK_RETVAL_ENUM TskAutoDb::addFsInfoUnalloc(const TSK_DB_FS_INFO & dbFsInfo) {
//walk unalloc blocks on the fs and process them
//initialize the unalloc block walk tracking
- UNALLOC_BLOCK_WLK_TRACK unallocBlockWlkTrack(*this, *fsInfo, dbFsInfo.objId, m_chunkSize);
+ UNALLOC_BLOCK_WLK_TRACK unallocBlockWlkTrack(*this, *fsInfo, dbFsInfo.objId, m_chunkSize);
uint8_t block_walk_ret = tsk_fs_block_walk(fsInfo, fsInfo->first_block, fsInfo->last_block, (TSK_FS_BLOCK_WALK_FLAG_ENUM)(TSK_FS_BLOCK_WALK_FLAG_UNALLOC | TSK_FS_BLOCK_WALK_FLAG_AONLY),
fsWalkUnallocBlocksCb, &unallocBlockWlkTrack);
@@ -887,8 +887,8 @@ TSK_RETVAL_ENUM TskAutoDb::addFsInfoUnalloc(const TSK_DB_FS_INFO & dbFsInfo) {
// make range inclusive from curBlockStart to prevBlock
const uint64_t byteStart = unallocBlockWlkTrack.curRangeStart * fsInfo->block_size + fsInfo->offset;
const uint64_t byteLen = (1 + unallocBlockWlkTrack.prevBlock - unallocBlockWlkTrack.curRangeStart) * fsInfo->block_size;
- unallocBlockWlkTrack.ranges.push_back(TSK_DB_FILE_LAYOUT_RANGE(byteStart, byteLen, unallocBlockWlkTrack.nextSequenceNo++));
- unallocBlockWlkTrack.size += byteLen;
+ unallocBlockWlkTrack.ranges.push_back(TSK_DB_FILE_LAYOUT_RANGE(byteStart, byteLen, unallocBlockWlkTrack.nextSequenceNo++));
+ unallocBlockWlkTrack.size += byteLen;
int64_t fileObjId = 0;
if (m_db->addUnallocBlockFile(m_curUnallocDirId, dbFsInfo.objId, unallocBlockWlkTrack.size, unallocBlockWlkTrack.ranges, fileObjId, m_curImgId) == TSK_ERR) {
@@ -1109,8 +1109,8 @@ const std::string TskAutoDb::getCurDir() {
bool TskAutoDb::isDbOpen() {
- if(m_db!=NULL) {
- return m_db->isDbOpen();
- }
- return false;
+ if(m_db!=NULL) {
+ return m_db->isDbOpen();
+ }
+ return false;
}
diff --git a/tsk/auto/db_postgresql.cpp b/tsk/auto/db_postgresql.cpp
index 21c80bad9..8d47280c8 100755
--- a/tsk/auto/db_postgresql.cpp
+++ b/tsk/auto/db_postgresql.cpp
@@ -505,7 +505,7 @@ int TskDbPostgreSQL::initialize() {
("CREATE TABLE tsk_vs_info (obj_id BIGSERIAL PRIMARY KEY, vs_type INTEGER NOT NULL, img_offset BIGINT NOT NULL, block_size BIGINT NOT NULL, FOREIGN KEY(obj_id) REFERENCES tsk_objects(obj_id));",
"Error creating tsk_vs_info table: %s\n")
||
- attempt_exec
+ attempt_exec
("CREATE TABLE data_source_info (obj_id INTEGER PRIMARY KEY, device_id TEXT NOT NULL, time_zone TEXT NOT NULL, FOREIGN KEY(obj_id) REFERENCES tsk_objects(obj_id));",
"Error creating data_source_info table: %s\n")
||
@@ -861,7 +861,7 @@ int TskDbPostgreSQL::addFsFile(TSK_FS_FILE * fs_file,
*/
int TskDbPostgreSQL::addFile(TSK_FS_FILE * fs_file, const TSK_FS_ATTR * fs_attr, const char *path,
const unsigned char *const md5, const TSK_DB_FILES_KNOWN_ENUM known, int64_t fsObjId, int64_t parObjId, int64_t & objId,
- int64_t dataSourceObjId)
+ int64_t dataSourceObjId)
{
time_t mtime = 0;
time_t crtime = 0;
@@ -973,7 +973,7 @@ int TskDbPostgreSQL::addFile(TSK_FS_FILE * fs_file, const TSK_FS_ATTR * fs_attr,
"VALUES ("
"%" PRId64 ",%" PRId64 ","
"%" PRId64 ","
- "%d,"
+ "%d,"
"%d,%d,%s,"
"%" PRIuINUM ",%d,"
"%d,%d,%d,%d,"
@@ -982,7 +982,7 @@ int TskDbPostgreSQL::addFile(TSK_FS_FILE * fs_file, const TSK_FS_ATTR * fs_attr,
"%d,%d,%d,%s,%d,"
"%s)",
fsObjId, objId,
- dataSourceObjId,
+ dataSourceObjId,
TSK_DB_FILES_TYPE_FS,
type, idx, name_sql,
fs_file->name->meta_addr, fs_file->name->meta_seq,
@@ -1266,7 +1266,7 @@ TSK_RETVAL_ENUM TskDbPostgreSQL::addVirtualDir(const int64_t fsObjId, const int6
PQfreemem(name_sql);
return TSK_ERR;
}
- snprintf(zSQL, 2048, "INSERT INTO tsk_files (attr_type, attr_id, has_layout, fs_obj_id, obj_id, data_source_obj_id type, "
+ snprintf(zSQL, 2048, "INSERT INTO tsk_files (attr_type, attr_id, has_layout, fs_obj_id, obj_id, data_source_obj_id type, "
"name, meta_addr, meta_seq, dir_type, meta_type, dir_flags, meta_flags, size, "
"crtime, ctime, atime, mtime, mode, gid, uid, known, parent_path) "
"VALUES ("
@@ -1275,7 +1275,7 @@ TSK_RETVAL_ENUM TskDbPostgreSQL::addVirtualDir(const int64_t fsObjId, const int6
"%lld,"
"%lld,"
"%" PRId64 ","
- "%d,"
+ "%d,"
"%s,"
"NULL,NULL,"
"%d,%d,%d,%d,"
@@ -1283,7 +1283,7 @@ TSK_RETVAL_ENUM TskDbPostgreSQL::addVirtualDir(const int64_t fsObjId, const int6
"NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/')",
fsObjId,
objId,
- dataSourceObjId,
+ dataSourceObjId,
TSK_DB_FILES_TYPE_VIRTUAL_DIR,
name_sql,
TSK_FS_NAME_TYPE_DIR, TSK_FS_META_TYPE_DIR,
@@ -1515,7 +1515,7 @@ TSK_RETVAL_ENUM TskDbPostgreSQL::addLayoutFileInfo(const int64_t parObjId, const
snprintf(zSQL, 2048, "INSERT INTO tsk_files (has_layout, fs_obj_id, obj_id, data_source_obj_id, type, attr_type, attr_id, name, meta_addr, meta_seq, dir_type, meta_type, dir_flags, meta_flags, size, crtime, ctime, atime, mtime, mode, gid, uid) "
"VALUES ("
"1, %s, %lld,"
- "%" PRId64 ","
+ "%" PRId64 ","
"%d,"
"NULL,NULL,%s,"
"NULL,NULL,"
@@ -1524,7 +1524,7 @@ TSK_RETVAL_ENUM TskDbPostgreSQL::addLayoutFileInfo(const int64_t parObjId, const
"NULL,NULL,NULL,NULL,NULL,NULL,NULL)",
fsObjIdStrPtr, objId,
dataSourceObjId,
- dbFileType,
+ dbFileType,
name_sql,
TSK_FS_NAME_TYPE_REG, TSK_FS_META_TYPE_REG,
TSK_FS_NAME_FLAG_UNALLOC, TSK_FS_META_FLAG_UNALLOC, size);
@@ -1859,17 +1859,17 @@ int TskDbPostgreSQL::releaseSavepoint(const char *name)
*/
bool TskDbPostgreSQL::isDbOpen()
{
- if (conn) {
- PGconn *serverConn = connectToDatabase(&m_dBName[0]);
- if (!serverConn) {
- return false;
- }
- PQfinish(serverConn);
- return true;
- }
- else {
- return false;
- }
+ if (conn) {
+ PGconn *serverConn = connectToDatabase(&m_dBName[0]);
+ if (!serverConn) {
+ return false;
+ }
+ PQfinish(serverConn);
+ return true;
+ }
+ else {
+ return false;
+ }
}
/**
diff --git a/tsk/auto/db_sqlite.cpp b/tsk/auto/db_sqlite.cpp
index b6062396a..17d702b61 100755
--- a/tsk/auto/db_sqlite.cpp
+++ b/tsk/auto/db_sqlite.cpp
@@ -267,8 +267,8 @@ int
attempt_exec
("CREATE TABLE tsk_fs_info (obj_id INTEGER PRIMARY KEY, img_offset INTEGER NOT NULL, fs_type INTEGER NOT NULL, block_size INTEGER NOT NULL, block_count INTEGER NOT NULL, root_inum INTEGER NOT NULL, first_inum INTEGER NOT NULL, last_inum INTEGER NOT NULL, display_name TEXT, FOREIGN KEY(obj_id) REFERENCES tsk_objects(obj_id));",
"Error creating tsk_fs_info table: %s\n")
- ||
- attempt_exec
+ ||
+ attempt_exec
("CREATE TABLE data_source_info (obj_id INTEGER PRIMARY KEY, device_id TEXT NOT NULL, time_zone TEXT NOT NULL, FOREIGN KEY(obj_id) REFERENCES tsk_objects(obj_id));",
"Error creating data_source_info table: %s\n")
||
@@ -896,7 +896,7 @@ int
"VALUES ("
"%" PRId64 ",%" PRId64 ","
"%" PRId64 ","
- "%d,"
+ "%d,"
"%d,%d,'%q',"
"%" PRIuINUM ",%d,"
"%d,%d,%d,%d,"
@@ -905,7 +905,7 @@ int
"%d,%d,%d,%Q,%d,"
"'%q')",
fsObjId, objId,
- dataSourceObjId,
+ dataSourceObjId,
TSK_DB_FILES_TYPE_FS,
type, idx, name,
fs_file->name->meta_addr, fs_file->name->meta_seq,
@@ -1022,7 +1022,7 @@ int
* @returns 1 on error
*/
int TskDbSqlite::addFileLayoutRange(const TSK_DB_FILE_LAYOUT_RANGE & fileLayoutRange) {
- return addFileLayoutRange(fileLayoutRange.fileObjId, fileLayoutRange.byteStart, fileLayoutRange.byteLen, fileLayoutRange.sequence);
+ return addFileLayoutRange(fileLayoutRange.fileObjId, fileLayoutRange.byteStart, fileLayoutRange.byteLen, fileLayoutRange.sequence);
}
@@ -1055,11 +1055,11 @@ TSK_RETVAL_ENUM
fsObjIdStrPtr = fsObjIdStr;
}
- zSQL = sqlite3_mprintf(
- "INSERT INTO tsk_files (has_layout, fs_obj_id, obj_id, data_source_obj_id, type, attr_type, attr_id, name, meta_addr, meta_seq, dir_type, meta_type, dir_flags, meta_flags, size, crtime, ctime, atime, mtime, mode, gid, uid) "
+ zSQL = sqlite3_mprintf(
+ "INSERT INTO tsk_files (has_layout, fs_obj_id, obj_id, data_source_obj_id, type, attr_type, attr_id, name, meta_addr, meta_seq, dir_type, meta_type, dir_flags, meta_flags, size, crtime, ctime, atime, mtime, mode, gid, uid) "
"VALUES ("
"1, %Q, %lld,"
- "%" PRId64 ","
+ "%" PRId64 ","
"%d,"
"NULL,NULL,'%q',"
"NULL,NULL,"
@@ -1067,7 +1067,7 @@ TSK_RETVAL_ENUM
"%" PRIuOFF ","
"NULL,NULL,NULL,NULL,NULL,NULL,NULL)",
fsObjIdStrPtr, objId,
- dataSourceObjId,
+ dataSourceObjId,
dbFileType,
fileName,
TSK_FS_NAME_TYPE_REG, TSK_FS_META_TYPE_REG,
@@ -1214,7 +1214,7 @@ TSK_RETVAL_ENUM TskDbSqlite::addVirtualDir(const int64_t fsObjId, const int64_t
if (addObject(TSK_DB_OBJECT_TYPE_FILE, parentDirId, objId))
return TSK_ERR;
- zSQL = sqlite3_mprintf(
+ zSQL = sqlite3_mprintf(
"INSERT INTO tsk_files (attr_type, attr_id, has_layout, fs_obj_id, obj_id, data_source_obj_id, type, attr_type, "
"attr_id, name, meta_addr, meta_seq, dir_type, meta_type, dir_flags, meta_flags, size, "
"crtime, ctime, atime, mtime, mode, gid, uid, known, parent_path) "
@@ -1223,7 +1223,7 @@ TSK_RETVAL_ENUM TskDbSqlite::addVirtualDir(const int64_t fsObjId, const int64_t
"NULL,"
"%lld,"
"%lld,"
- "%" PRId64 ","
+ "%" PRId64 ","
"%d,"
"NULL,NULL,'%q',"
"NULL,NULL,"
@@ -1232,7 +1232,7 @@ TSK_RETVAL_ENUM TskDbSqlite::addVirtualDir(const int64_t fsObjId, const int64_t
"NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'/')",
fsObjId,
objId,
- dataSourceObjId,
+ dataSourceObjId,
TSK_DB_FILES_TYPE_VIRTUAL_DIR,
name,
TSK_FS_NAME_TYPE_DIR, TSK_FS_META_TYPE_DIR,
diff --git a/tsk/auto/tsk_auto.h b/tsk/auto/tsk_auto.h
index 55e60ef64..e428fcb66 100644
--- a/tsk/auto/tsk_auto.h
+++ b/tsk/auto/tsk_auto.h
@@ -137,7 +137,7 @@ class TskAuto {
* @returns STOP or OK. All error must have been registered.
*/
virtual TSK_RETVAL_ENUM processFile(TSK_FS_FILE * fs_file,
- const char *path) = 0;
+ const char *path) = 0;
/**
diff --git a/tsk/auto/tsk_case_db.h b/tsk/auto/tsk_case_db.h
index c8b199ecb..397a2c9e9 100644
--- a/tsk/auto/tsk_case_db.h
+++ b/tsk/auto/tsk_case_db.h
@@ -46,15 +46,15 @@ class TskAutoDb:public TskAuto {
virtual TSK_FILTER_ENUM filterVol(const TSK_VS_PART_INFO * vs_part);
virtual TSK_FILTER_ENUM filterFs(TSK_FS_INFO * fs_info);
virtual TSK_RETVAL_ENUM processFile(TSK_FS_FILE * fs_file,
- const char *path);
+ const char *path);
virtual void createBlockMap(bool flag);
const std::string getCurDir();
-
- /**
- * Check if we can talk to the database.
- * Returns true if the database is reachable with current credentials, false otherwise.
- */
- bool isDbOpen();
+
+ /**
+ * Check if we can talk to the database.
+ * Returns true if the database is reachable with current credentials, false otherwise.
+ */
+ bool isDbOpen();
/**
* Calculate hash values of files and add them to database.
@@ -78,12 +78,12 @@ class TskAutoDb:public TskAuto {
*/
virtual void setAddUnallocSpace(bool addUnallocSpace);
- /**
+ /**
* When enabled, records for unallocated file system space will be added to the database. Default value is false.
* @param addUnallocSpace If true, create records for contigious unallocated file system sectors.
- * @param chunkSize the number of bytes to group unallocated data into. A value of 0 will create
- * one large chunk and group only on volume boundaries. A value of -1 will group each consecutive
- * chunk.
+ * @param chunkSize the number of bytes to group unallocated data into. A value of 0 will create
+ * one large chunk and group only on volume boundaries. A value of -1 will group each consecutive
+ * chunk.
*/
virtual void setAddUnallocSpace(bool addUnallocSpace, int64_t chunkSize);
@@ -124,7 +124,7 @@ class TskAutoDb:public TskAuto {
TSK_HDB_INFO * m_knownBadDb;
bool m_noFatFsOrphans;
bool m_addUnallocSpace;
- int64_t m_chunkSize;
+ int64_t m_chunkSize;
bool m_foundStructure; ///< Set to true when we find either a volume or file system
bool m_attributeAdded; ///< Set to true when an attribute was added by processAttributes
@@ -139,10 +139,10 @@ class TskAutoDb:public TskAuto {
const TskAutoDb & tskAutoDb;
const TSK_FS_INFO & fsInfo;
const int64_t fsObjId;
- vector<TSK_DB_FILE_LAYOUT_RANGE> ranges;
+ vector<TSK_DB_FILE_LAYOUT_RANGE> ranges;
TSK_DADDR_T curRangeStart;
- int64_t size;
- const int64_t chunkSize;
+ int64_t size;
+ const int64_t chunkSize;
TSK_DADDR_T prevBlock;
bool isStart;
uint32_t nextSequenceNo;
@@ -154,7 +154,7 @@ class TskAutoDb:public TskAuto {
const unsigned char *const md5,
const TSK_DB_FILES_KNOWN_ENUM known);
virtual TSK_RETVAL_ENUM processAttribute(TSK_FS_FILE *,
- const TSK_FS_ATTR * fs_attr, const char *path);
+ const TSK_FS_ATTR * fs_attr, const char *path);
static TSK_WALK_RET_ENUM md5HashCallback(TSK_FS_FILE * file,
TSK_OFF_T offset, TSK_DADDR_T addr, char *buf, size_t size,
TSK_FS_BLOCK_FLAG_ENUM a_flags, void *ptr);
--
GitLab