Codacy fixes

bindings/java/jni/auto_db_java.cpp

@@ -597,7 +597,9 @@ TskAutoDbJava::addFile(TSK_FS_FILE* fs_file,
     // Add the attribute name
     if (attr_nlen > 0) {
         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
@@ -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
 
     return allFsProcessRet;
-    return TSK_OK;
 }
 
 /**

bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java

@@ -312,7 +312,7 @@ long addLayoutFile(long parentObjId,
                 fsObjIdForDb = null;
             }
             
-            long objId = caseDb.addFileJNI(parentObjId, 
+            return caseDb.addFileJNI(parentObjId, 
                 fsObjIdForDb, dataSourceObjId,
                 fileType,
                 null, null, name,
@@ -327,7 +327,6 @@ long addLayoutFile(long parentObjId,
                 null, TskData.FileKnown.UNKNOWN,
                 null, null, 
                 true, trans);
-            return objId;
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Error adding layout file to the database - parent object ID: " + parentObjId
                     + ", file system object ID: " + fsObjId + ", name: " + name, ex);