From 2e387fa068593addaa6f4691e8f1e7b45d59b1f4 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Fri, 4 Dec 2015 11:43:41 -0500
Subject: [PATCH] Fix compiler warnings
---
tests/fs_attrlist_apis.cpp | 2 +-
tsk/auto/auto_db.cpp | 6 +++---
tsk/auto/db_sqlite.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/fs_attrlist_apis.cpp b/tests/fs_attrlist_apis.cpp
index 3d0c265e2..57a805937 100644
--- a/tests/fs_attrlist_apis.cpp
+++ b/tests/fs_attrlist_apis.cpp
@@ -119,7 +119,7 @@ test_get_apis(TSK_FS_INFO * a_fs, TSK_INUM_T a_addr, int a_len)
if (fs_attr != fs_attr2) {
fprintf(stderr,
"Attribute from get_type not same addr as original %lu vs %lu from %"
- PRIuINUM "\n", fs_attr, fs_attr2, a_addr);
+ PRIuINUM "\n", (unsigned long)fs_attr, (unsigned long)fs_attr2, a_addr);
tsk_error_print(stderr);
return 1;
}
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 0a9b124c6..70eaf9143 100644
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -767,9 +767,9 @@ TSK_WALK_RET_ENUM TskAutoDb::fsWalkUnallocBlocksCb(const TSK_FS_BLOCK *a_block,
// 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) {
+ if ((unallocBlockWlkTrack->chunkSize == 0) ||
+ ((unallocBlockWlkTrack->chunkSize > 0) &&
+ (unallocBlockWlkTrack->size < unallocBlockWlkTrack->chunkSize))) {
return TSK_WALK_CONT;
}
diff --git a/tsk/auto/db_sqlite.cpp b/tsk/auto/db_sqlite.cpp
index b9fd5abf0..e08dba291 100755
--- a/tsk/auto/db_sqlite.cpp
+++ b/tsk/auto/db_sqlite.cpp
@@ -716,7 +716,7 @@ int64_t TskDbSqlite::findParObjId(const TSK_FS_FILE * fs_file, const char *path,
return fileMap[seq];
}
else {
- printf("Miss: %d\n", fileMap.count(seq));
+ printf("Miss: %zu\n", fileMap.count(seq));
}
}
--
GitLab