From 27f58954db06a9796754ca17324c07204bb43908 Mon Sep 17 00:00:00 2001 From: apriestman <apriestman@basistech.com> Date: Tue, 15 Sep 2020 14:54:37 -0400 Subject: [PATCH] Changed type for pvol_block and snap_id --- tools/autotools/tsk_comparedir.cpp | 4 ++-- tools/autotools/tsk_recover.cpp | 4 ++-- tools/fstools/blkcalc.cpp | 4 ++-- tools/fstools/blkcat.cpp | 4 ++-- tools/fstools/blkls.cpp | 6 +++--- tools/fstools/blkstat.cpp | 4 ++-- tools/fstools/fcat.cpp | 4 ++-- tools/fstools/ffind.cpp | 4 ++-- tools/fstools/fls.cpp | 10 +++++----- tools/fstools/fsstat.cpp | 4 ++-- tools/fstools/icat.cpp | 8 ++++---- tools/fstools/ifind.cpp | 4 ++-- tools/fstools/ils.cpp | 4 ++-- tools/fstools/istat.cpp | 8 ++++---- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/tools/autotools/tsk_comparedir.cpp b/tools/autotools/tsk_comparedir.cpp index 95b76a8a6..0ab30faf8 100644 --- a/tools/autotools/tsk_comparedir.cpp +++ b/tools/autotools/tsk_comparedir.cpp @@ -347,7 +347,7 @@ main(int argc, char **argv1) unsigned int ssize = 0; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; #ifdef WIN32 @@ -475,7 +475,7 @@ main(int argc, char **argv1) exit(1); } - if (tskCompareDir.openFs(soffset, fstype, pooltype, pvol_block)) { + if (tskCompareDir.openFs(soffset, fstype, pooltype, (TSK_DADDR_T)pvol_block)) { // Errors were already logged exit(1); } diff --git a/tools/autotools/tsk_recover.cpp b/tools/autotools/tsk_recover.cpp index 23235458f..997bd60d5 100755 --- a/tools/autotools/tsk_recover.cpp +++ b/tools/autotools/tsk_recover.cpp @@ -415,7 +415,7 @@ main(int argc, char **argv1) TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT; TSK_FS_TYPE_ENUM fstype = TSK_FS_TYPE_DETECT; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; int ch; TSK_TCHAR **argv; unsigned int ssize = 0; @@ -556,7 +556,7 @@ main(int argc, char **argv1) exit(1); } - if (tskRecover.openFs(soffset, fstype, pooltype, pvol_block)) { + if (tskRecover.openFs(soffset, fstype, pooltype, (TSK_DADDR_T)pvol_block)) { // Errors were already logged exit(1); } diff --git a/tools/fstools/blkcalc.cpp b/tools/fstools/blkcalc.cpp index 0ce7176d5..9307d79a1 100644 --- a/tools/fstools/blkcalc.cpp +++ b/tools/fstools/blkcalc.cpp @@ -72,7 +72,7 @@ main(int argc, char **argv1) TSK_FS_INFO *fs; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; int ch; @@ -262,7 +262,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/blkcat.cpp b/tools/fstools/blkcat.cpp index a01e9eac8..609e58a25 100644 --- a/tools/fstools/blkcat.cpp +++ b/tools/fstools/blkcat.cpp @@ -73,7 +73,7 @@ main(int argc, char **argv1) TSK_FS_INFO *fs; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; TSK_DADDR_T addr = 0; @@ -323,7 +323,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/blkls.cpp b/tools/fstools/blkls.cpp index 3321228dc..bf8aa2e36 100644 --- a/tools/fstools/blkls.cpp +++ b/tools/fstools/blkls.cpp @@ -80,7 +80,7 @@ main(int argc, char **argv1) TSK_FS_INFO *fs; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; TSK_TCHAR *cp, *dash; @@ -248,7 +248,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) @@ -364,7 +364,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/blkstat.cpp b/tools/fstools/blkstat.cpp index 3a512b463..f816ee164 100644 --- a/tools/fstools/blkstat.cpp +++ b/tools/fstools/blkstat.cpp @@ -57,7 +57,7 @@ main(int argc, char **argv1) TSK_FS_INFO *fs; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; int ch; @@ -200,7 +200,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/fcat.cpp b/tools/fstools/fcat.cpp index eec431d49..0e7e72b7b 100644 --- a/tools/fstools/fcat.cpp +++ b/tools/fstools/fcat.cpp @@ -55,7 +55,7 @@ main(int argc, char **argv1) TSK_FS_INFO *fs; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; // Not currently used TSK_INUM_T inum; @@ -214,7 +214,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/ffind.cpp b/tools/fstools/ffind.cpp index f3c0fed12..d9565bc4e 100644 --- a/tools/fstools/ffind.cpp +++ b/tools/fstools/ffind.cpp @@ -63,7 +63,7 @@ main(int argc, char **argv1) TSK_FS_INFO *fs; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; // Not currently used int dir_walk_flags = TSK_FS_DIR_WALK_FLAG_RECURSE; @@ -231,7 +231,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/fls.cpp b/tools/fstools/fls.cpp index ece240bee..41676b0b2 100644 --- a/tools/fstools/fls.cpp +++ b/tools/fstools/fls.cpp @@ -96,8 +96,8 @@ main(int argc, char **argv1) TSK_TCHAR *cp; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; - TSK_DADDR_T snap_id = 0; + TSK_OFF_T pvol_block = 0; + TSK_OFF_T snap_id = 0; #ifdef TSK_WIN32 // On Windows, get the wide arguments (mingw doesn't support wmain) @@ -330,7 +330,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) @@ -382,7 +382,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) @@ -394,7 +394,7 @@ main(int argc, char **argv1) } if (snap_id > 0) { - tsk_apfs_set_snapshot(fs, snap_id); + tsk_apfs_set_snapshot(fs, (uint64_t)snap_id); } if (tsk_fs_fls(fs, (TSK_FS_FLS_FLAG_ENUM) fls_flags, inode, diff --git a/tools/fstools/fsstat.cpp b/tools/fstools/fsstat.cpp index fcdae9e53..ca6a6a014 100644 --- a/tools/fstools/fsstat.cpp +++ b/tools/fstools/fsstat.cpp @@ -57,7 +57,7 @@ main(int argc, char **argv1) const char * password = ""; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; int ch; uint8_t type = 0; @@ -210,7 +210,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/icat.cpp b/tools/fstools/icat.cpp index 2f6622cf2..b1656dc1d 100644 --- a/tools/fstools/icat.cpp +++ b/tools/fstools/icat.cpp @@ -73,8 +73,8 @@ main(int argc, char **argv1) const char * password = ""; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; - TSK_DADDR_T snap_id = 0; + TSK_OFF_T pvol_block = 0; + TSK_OFF_T snap_id = 0; TSK_INUM_T inum; int fw_flags = 0; @@ -249,7 +249,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) @@ -277,7 +277,7 @@ main(int argc, char **argv1) } if (snap_id > 0) { - tsk_apfs_set_snapshot(fs, snap_id); + tsk_apfs_set_snapshot(fs, (uint64_t)snap_id); } retval = diff --git a/tools/fstools/ifind.cpp b/tools/fstools/ifind.cpp index 713a9c8c5..59040dc0e 100644 --- a/tools/fstools/ifind.cpp +++ b/tools/fstools/ifind.cpp @@ -77,7 +77,7 @@ main(int argc, char **argv1) uint8_t type = 0; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; // Not currently used int ch; @@ -291,7 +291,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/ils.cpp b/tools/fstools/ils.cpp index 8116ef115..22a6087da 100644 --- a/tools/fstools/ils.cpp +++ b/tools/fstools/ils.cpp @@ -81,7 +81,7 @@ main(int argc, char **argv1) TSK_FS_INFO *fs; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; + TSK_OFF_T pvol_block = 0; const char * password = ""; // Not currently used TSK_TCHAR *cp, *dash; @@ -367,7 +367,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) diff --git a/tools/fstools/istat.cpp b/tools/fstools/istat.cpp index 75fb6c4b6..42b7928a8 100644 --- a/tools/fstools/istat.cpp +++ b/tools/fstools/istat.cpp @@ -72,8 +72,8 @@ main(int argc, char **argv1) const char * password = ""; TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT; - TSK_DADDR_T pvol_block = 0; - TSK_DADDR_T snap_id = 0; + TSK_OFF_T pvol_block = 0; + TSK_OFF_T snap_id = 0; TSK_INUM_T inum; int ch; @@ -268,7 +268,7 @@ main(int argc, char **argv1) exit(1); } - img = pool->get_img_info(pool, pvol_block); + img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block); if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) { tsk_error_print(stderr); if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE) @@ -297,7 +297,7 @@ main(int argc, char **argv1) } if (snap_id > 0) { - tsk_apfs_set_snapshot(fs, snap_id); + tsk_apfs_set_snapshot(fs, (uint64_t)snap_id); } if (fs->istat(fs, (TSK_FS_ISTAT_FLAG_ENUM) istat_flags, stdout, inum, numblock, sec_skew)) { -- GitLab