diff --git a/tests/fs_attrlist_apis.cpp b/tests/fs_attrlist_apis.cpp index 3d0c265e229c6f0915aee0305494d7ef01e88c6b..57a805937ad11fb2c646cdc45b9c80142dce92da 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 0a9b124c6e7123ffe729864cedc506d512acd253..70eaf9143e114f8773933810536eccf364ae386e 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 b9fd5abf0d30217315829763f50f5e41300d3ca3..e08dba2916bf109d0cefc1a6115f1381981686ae 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)); } }