From 7f3a2048561c7fa0fef13a983b4abdb165e20ad4 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Tue, 8 Sep 2020 11:02:16 -0400
Subject: [PATCH] Fixed compiler warnings
---
bindings/java/jni/auto_db_java.cpp | 6 +++---
tsk/auto/auto.cpp | 4 ++--
tsk/auto/auto_db.cpp | 4 ++--
tsk/auto/db_sqlite.cpp | 3 +--
tsk/fs/fs_dir.c | 3 ++-
tsk/img/raw.c | 2 ++
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/bindings/java/jni/auto_db_java.cpp b/bindings/java/jni/auto_db_java.cpp
index a94940e78..6edb0125d 100644
--- a/bindings/java/jni/auto_db_java.cpp
+++ b/bindings/java/jni/auto_db_java.cpp
@@ -904,7 +904,7 @@ TskAutoDbJava::addUnallocFsBlockFilesParent(const int64_t fsObjId, int64_t& objI
TSK_RETVAL_ENUM
TskAutoDbJava::addUnallocatedPoolVolume(int vol_index, int64_t parObjId, int64_t& objId)
{
- char *desc = "Unallocated Blocks";
+ const char *desc = "Unallocated Blocks";
jstring descj = m_jniEnv->NewStringUTF(desc);
jlong objIdj = m_jniEnv->CallLongMethod(m_javaDbObj, m_addVolumeMethodID,
@@ -1179,7 +1179,7 @@ TskAutoDbJava::filterPool(const TSK_POOL_INFO * pool_info)
TSK_RETVAL_ENUM
TskAutoDbJava::addUnallocatedPoolBlocksToDb(size_t & numPool) {
- for (int i = 0; i < m_poolInfos.size(); i++) {
+ for (size_t i = 0; i < m_poolInfos.size(); i++) {
const TSK_POOL_INFO * pool_info = m_poolInfos[i];
if (m_poolOffsetToVsId.find(pool_info->img_offset) == m_poolOffsetToVsId.end()) {
tsk_error_reset();
@@ -1224,7 +1224,7 @@ TskAutoDbJava::addUnallocatedPoolBlocksToDb(size_t & numPool) {
ranges.push_back(tempRange);
int64_t fileObjId = 0;
- if (TSK_ERR == addUnallocBlockFile(unallocVolObjId, NULL, current_run->len * pool_info->block_size, ranges, fileObjId, m_curImgId)) {
+ if (TSK_ERR == addUnallocBlockFile(unallocVolObjId, 0, current_run->len * pool_info->block_size, ranges, fileObjId, m_curImgId)) {
registerError();
tsk_fs_attr_run_free(unalloc_runs);
return TSK_ERR;
diff --git a/tsk/auto/auto.cpp b/tsk/auto/auto.cpp
index 2114f0b24..b80c2832a 100755
--- a/tsk/auto/auto.cpp
+++ b/tsk/auto/auto.cpp
@@ -146,7 +146,7 @@ uint8_t TskAuto::openImageHandle(TSK_IMG_INFO * a_img_info)
void
TskAuto::closeImage()
{
- for (int i = 0; i < m_poolInfos.size(); i++) {
+ for (size_t i = 0; i < m_poolInfos.size(); i++) {
tsk_pool_close(m_poolInfos[i]);
}
m_poolInfos.clear();
@@ -438,7 +438,7 @@ TskAuto::findFilesInPool(TSK_OFF_T start, TSK_POOL_TYPE_ENUM ptype)
TSK_FILTER_ENUM retval1 = filterPool(pool);
if (retval1 == TSK_FILTER_SKIP)
return TSK_OK;
- else if ((retval1 == TSK_FILTER_STOP))
+ else if (retval1 == TSK_FILTER_STOP)
return TSK_STOP;
/* Only APFS pools are currently supported */
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 0fdfdf670..0265c72c0 100755
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -344,7 +344,7 @@ TskAutoDb::filterPool(const TSK_POOL_INFO * pool_info)
TSK_RETVAL_ENUM
TskAutoDb::addUnallocatedPoolBlocksToDb(size_t & numPool) {
- for (int i = 0; i < m_poolInfos.size(); i++) {
+ for (size_t i = 0; i < m_poolInfos.size(); i++) {
const TSK_POOL_INFO * pool_info = m_poolInfos[i];
if (m_poolOffsetToVsId.find(pool_info->img_offset) == m_poolOffsetToVsId.end()) {
tsk_error_reset();
@@ -384,7 +384,7 @@ TskAutoDb::addUnallocatedPoolBlocksToDb(size_t & numPool) {
ranges.push_back(tempRange);
int64_t fileObjId = 0;
- if (m_db->addUnallocBlockFile(unallocVolObjId, NULL, current_run->len * pool_info->block_size, ranges, fileObjId, m_curImgId)) {
+ if (m_db->addUnallocBlockFile(unallocVolObjId, 0, current_run->len * pool_info->block_size, ranges, fileObjId, m_curImgId)) {
registerError();
tsk_fs_attr_run_free(unalloc_runs);
return TSK_ERR;
diff --git a/tsk/auto/db_sqlite.cpp b/tsk/auto/db_sqlite.cpp
index 5625c5ad2..4a402ee37 100644
--- a/tsk/auto/db_sqlite.cpp
+++ b/tsk/auto/db_sqlite.cpp
@@ -815,12 +815,11 @@ TskDbSqlite::addUnallocatedPoolVolume(int vol_index, int64_t parObjId, int64_t&
if (addObject(TSK_DB_OBJECT_TYPE_VOL, parObjId, objId))
return 1;
- char* desc = "Unallocated Blocks";
zSQL = sqlite3_mprintf(
"INSERT INTO tsk_vs_parts (obj_id, addr, start, length, desc, flags)"
"VALUES (%lld, %" PRIuPNUM ",%" PRIuDADDR ",%" PRIuDADDR ",'%q',%d)",
objId, vol_index, 0, 0,
- desc, 0);
+ "Unallocated Blocks", 0);
ret = attempt_exec(zSQL,
"Error adding data to tsk_vs_parts table: %s\n");
diff --git a/tsk/fs/fs_dir.c b/tsk/fs/fs_dir.c
index 199f56aaa..ae8e36202 100644
--- a/tsk/fs/fs_dir.c
+++ b/tsk/fs/fs_dir.c
@@ -550,7 +550,8 @@ prioritizeDirNames(TSK_FS_NAME * names, size_t count, int * indexToOrderedIndex)
const int LOW = 2;
const int LAST = 3;
int * scores;
- int i, currentScore;
+ int currentScore;
+ size_t i;
scores = (int *)tsk_malloc(count * sizeof(int));
if (scores == NULL) {
diff --git a/tsk/img/raw.c b/tsk/img/raw.c
index daf19babe..e8e0f1113 100755
--- a/tsk/img/raw.c
+++ b/tsk/img/raw.c
@@ -46,10 +46,12 @@
*
* Return 1 if the path represents a Windows device, 0 otherwise
*/
+#ifdef TSK_WIN32
static int
is_windows_device_path(const TSK_TCHAR * image_name) {
return (TSTRNCMP(image_name, _TSK_T("\\\\.\\"), 4) == 0);
}
+#endif
/**
* \internal
--
GitLab