Skip to content
Snippets Groups Projects
Commit 7f508f8e authored by apriestman's avatar apriestman
Browse files

Codacy fixes

parent 1cbb5d08
No related branches found
No related tags found
No related merge requests found
...@@ -597,7 +597,9 @@ TskAutoDbJava::addFile(TSK_FS_FILE* fs_file, ...@@ -597,7 +597,9 @@ TskAutoDbJava::addFile(TSK_FS_FILE* fs_file,
// Add the attribute name // Add the attribute name
if (attr_nlen > 0) { if (attr_nlen > 0) {
strncat(name, ":", nlen - strlen(name)); strncat(name, ":", nlen - strlen(name));
strncat(name, fs_attr->name, nlen - strlen(name)); if (fs_attr != NULL) {
strncat(name, fs_attr->name, nlen - strlen(name));
}
} }
// clean up path // clean up path
...@@ -1945,7 +1947,6 @@ TSK_RETVAL_ENUM TskAutoDbJava::addUnallocFsSpaceToDb(size_t & numFs) { ...@@ -1945,7 +1947,6 @@ TSK_RETVAL_ENUM TskAutoDbJava::addUnallocFsSpaceToDb(size_t & numFs) {
//TODO set parent_path for newly created virt dir/file hierarchy for consistency //TODO set parent_path for newly created virt dir/file hierarchy for consistency
return allFsProcessRet; return allFsProcessRet;
return TSK_OK;
} }
/** /**
......
...@@ -312,7 +312,7 @@ long addLayoutFile(long parentObjId, ...@@ -312,7 +312,7 @@ long addLayoutFile(long parentObjId,
fsObjIdForDb = null; fsObjIdForDb = null;
} }
long objId = caseDb.addFileJNI(parentObjId, return caseDb.addFileJNI(parentObjId,
fsObjIdForDb, dataSourceObjId, fsObjIdForDb, dataSourceObjId,
fileType, fileType,
null, null, name, null, null, name,
...@@ -327,7 +327,6 @@ long addLayoutFile(long parentObjId, ...@@ -327,7 +327,6 @@ long addLayoutFile(long parentObjId,
null, TskData.FileKnown.UNKNOWN, null, TskData.FileKnown.UNKNOWN,
null, null, null, null,
true, trans); true, trans);
return objId;
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error adding layout file to the database - parent object ID: " + parentObjId logger.log(Level.SEVERE, "Error adding layout file to the database - parent object ID: " + parentObjId
+ ", file system object ID: " + fsObjId + ", name: " + name, ex); + ", file system object ID: " + fsObjId + ", name: " + name, ex);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment