From b942ab5504ee473e890f9f4062b4deac23abaa46 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Fri, 8 May 2009 12:54:32 +0000
Subject: [PATCH] resolved issue 2596153 on Unix systems. The issue changes
the const definitions in img_opens().
---
tests/fs_attrlist_apis.cpp | 127 ++++++++++++++++++++----------------
tests/fs_fname_apis.cpp | 12 +---
tests/read_apis.cpp | 36 ++++------
tools/fstools/blkcalc.cpp | 13 ++--
tools/fstools/blkcat.cpp | 23 +++----
tools/fstools/blkls.cpp | 26 +++-----
tools/fstools/blkstat.cpp | 14 ++--
tools/fstools/ffind.cpp | 14 ++--
tools/fstools/fls.cpp | 16 ++---
tools/fstools/fscheck.cpp | 8 +--
tools/fstools/fsstat.cpp | 13 ++--
tools/fstools/icat.cpp | 21 +++---
tools/fstools/ifind.cpp | 13 ++--
tools/fstools/ils.cpp | 25 +++----
tools/fstools/istat.cpp | 14 ++--
tools/fstools/jcat.cpp | 16 ++---
tools/fstools/jls.cpp | 16 ++---
tools/imgtools/img_cat.cpp | 22 +++----
tools/imgtools/img_stat.cpp | 13 ++--
tools/vstools/mmcat.cpp | 14 ++--
tools/vstools/mmls.cpp | 14 ++--
tools/vstools/mmstat.cpp | 13 ++--
tsk3/img/aff.c | 2 +-
tsk3/img/aff.h | 2 +-
tsk3/img/ewf.c | 2 +-
tsk3/img/ewf.h | 2 +-
tsk3/img/img_io.c | 28 ++++----
tsk3/img/img_open.c | 13 ++--
tsk3/img/raw.c | 4 +-
tsk3/img/split.c | 10 +--
tsk3/img/split.h | 4 +-
tsk3/img/tsk_img.h | 4 +-
32 files changed, 269 insertions(+), 285 deletions(-)
diff --git a/tests/fs_attrlist_apis.cpp b/tests/fs_attrlist_apis.cpp
index 1214f39d7..c0084876f 100644
--- a/tests/fs_attrlist_apis.cpp
+++ b/tests/fs_attrlist_apis.cpp
@@ -23,28 +23,31 @@ static char *s_root;
* @returns 1 if a test failed
*/
static int
-test_get_type(TSK_FS_INFO *a_fs, TSK_INUM_T a_addr, TSK_FS_ATTR_TYPE_ENUM a_type)
+test_get_type(TSK_FS_INFO * a_fs, TSK_INUM_T a_addr,
+ TSK_FS_ATTR_TYPE_ENUM a_type)
{
TSK_FS_FILE *fs_file;
-
+
// open the file
fs_file = tsk_fs_file_open_meta(a_fs, NULL, a_addr);
if (!fs_file) {
fprintf(stderr, "Error opening file %" PRIuINUM " via meta\n",
- a_addr);
+ a_addr);
tsk_error_print(stderr);
return 1;
}
-
+
// verify the specified type can be opened
- const TSK_FS_ATTR *fs_attr = tsk_fs_file_attr_get_type(fs_file, a_type, 0, 0);
+ const TSK_FS_ATTR *fs_attr =
+ tsk_fs_file_attr_get_type(fs_file, a_type, 0, 0);
if (!fs_attr) {
- fprintf(stderr, "Error getting specified attribute %d-X (no id) from %" PRIuINUM "\n",
- a_type, a_addr);
+ fprintf(stderr,
+ "Error getting specified attribute %d-X (no id) from %"
+ PRIuINUM "\n", a_type, a_addr);
tsk_error_print(stderr);
return 1;
}
-
+
tsk_fs_file_close(fs_file);
return 0;
}
@@ -64,104 +67,122 @@ test_get_apis(TSK_FS_INFO * a_fs, TSK_INUM_T a_addr, int a_len)
fs_file = tsk_fs_file_open_meta(a_fs, NULL, a_addr);
if (!fs_file) {
fprintf(stderr, "Error opening file %" PRIuINUM " via meta\n",
- a_addr);
+ a_addr);
tsk_error_print(stderr);
return 1;
}
-
+
int len = tsk_fs_file_attr_getsize(fs_file);
if (len != a_len) {
- fprintf(stderr, "%" PRIuINUM " attribute count diff from expected (%d vs %d)\n",
- a_addr, a_len, len);
+ fprintf(stderr,
+ "%" PRIuINUM
+ " attribute count diff from expected (%d vs %d)\n", a_addr,
+ a_len, len);
tsk_error_print(stderr);
return 1;
}
-
+
for (int i = 0; i < len; i++) {
-
+
// get the attribute by index
const TSK_FS_ATTR *fs_attr = tsk_fs_file_attr_get_idx(fs_file, i);
if (!fs_attr) {
- fprintf(stderr, "Error getting attribute %d from %" PRIuINUM "\n",
- i, a_addr);
+ fprintf(stderr,
+ "Error getting attribute %d from %" PRIuINUM "\n", i,
+ a_addr);
tsk_error_print(stderr);
return 1;
}
-
+
// verify we can also get it via type / id
- const TSK_FS_ATTR *fs_attr2 = tsk_fs_file_attr_get_type(fs_file, fs_attr->type, fs_attr->id, 1);
+ const TSK_FS_ATTR *fs_attr2 =
+ tsk_fs_file_attr_get_type(fs_file, fs_attr->type, fs_attr->id,
+ 1);
if (!fs_attr2) {
- fprintf(stderr, "Error getting attribute %d-%d from %" PRIuINUM "\n",
- fs_attr->type, fs_attr->id, a_addr);
+ fprintf(stderr,
+ "Error getting attribute %d-%d from %" PRIuINUM "\n",
+ fs_attr->type, fs_attr->id, a_addr);
tsk_error_print(stderr);
return 1;
}
-
- if ((fs_attr->type != fs_attr2->type) || (fs_attr->id != fs_attr2->id)) {
- fprintf(stderr, "Attribute from get_type not expected %d-%d vs %d-%d from %" PRIuINUM "\n",
- fs_attr->type, fs_attr->id,
- fs_attr2->type, fs_attr2->id, a_addr);
+
+ if ((fs_attr->type != fs_attr2->type)
+ || (fs_attr->id != fs_attr2->id)) {
+ fprintf(stderr,
+ "Attribute from get_type not expected %d-%d vs %d-%d from %"
+ PRIuINUM "\n", fs_attr->type, fs_attr->id, fs_attr2->type,
+ fs_attr2->id, a_addr);
tsk_error_print(stderr);
return 1;
}
-
+
if (fs_attr != fs_attr2) {
- fprintf(stderr, "Attribute from get_type not same addr as original %lu vs %lu from %" PRIuINUM "\n",
- (long)fs_attr, (long)fs_attr2, a_addr);
+ fprintf(stderr,
+ "Attribute from get_type not same addr as original %lu vs %lu from %"
+ PRIuINUM "\n", (long) fs_attr, (long) fs_attr2, a_addr);
tsk_error_print(stderr);
return 1;
}
-
+
// verify we also get something via only type
fs_attr2 = tsk_fs_file_attr_get_type(fs_file, fs_attr->type, 0, 0);
if (!fs_attr2) {
- fprintf(stderr, "Error getting attribute %d (no id) from %" PRIuINUM "\n",
- fs_attr->type, a_addr);
+ fprintf(stderr,
+ "Error getting attribute %d (no id) from %" PRIuINUM "\n",
+ fs_attr->type, a_addr);
tsk_error_print(stderr);
return 1;
}
-
+
if (fs_attr->type != fs_attr2->type) {
- fprintf(stderr, "Attribute from get_type (no id) not expected %d vs %d from %" PRIuINUM "\n",
- fs_attr->type, fs_attr2->type, a_addr);
+ fprintf(stderr,
+ "Attribute from get_type (no id) not expected %d vs %d from %"
+ PRIuINUM "\n", fs_attr->type, fs_attr2->type, a_addr);
tsk_error_print(stderr);
return 1;
}
// Try with a "random" ID: Note this atribute could actually exist...
- fs_attr2 = tsk_fs_file_attr_get_type(fs_file, fs_attr->type, 0xfd, 1);
+ fs_attr2 =
+ tsk_fs_file_attr_get_type(fs_file, fs_attr->type, 0xfd, 1);
if (fs_attr2) {
- fprintf(stderr, "Got unexpected attribute %d-0xfd (random ID) from %" PRIuINUM "\n",
- fs_attr->type, a_addr);
+ fprintf(stderr,
+ "Got unexpected attribute %d-0xfd (random ID) from %"
+ PRIuINUM "\n", fs_attr->type, a_addr);
tsk_error_print(stderr);
return 1;
}
else if (tsk_errno != TSK_ERR_FS_ATTR_NOTFOUND) {
- fprintf(stderr, "Unexpected error code %x from getting %d-0xfd (random ID) from %" PRIuINUM "\n",
- (int)tsk_errno, fs_attr->type, a_addr);
+ fprintf(stderr,
+ "Unexpected error code %x from getting %d-0xfd (random ID) from %"
+ PRIuINUM "\n", (int) tsk_errno, fs_attr->type, a_addr);
tsk_error_print(stderr);
return 1;
}
tsk_error_reset();
// Try with a "random" type Note this atribute could actually exist...
- fs_attr2 = tsk_fs_file_attr_get_type(fs_file, (TSK_FS_ATTR_TYPE_ENUM)(fs_attr->type + 37), 0, 0);
+ fs_attr2 =
+ tsk_fs_file_attr_get_type(fs_file,
+ (TSK_FS_ATTR_TYPE_ENUM) (fs_attr->type + 37), 0, 0);
if (fs_attr2) {
- fprintf(stderr, "Got unexpected attribute %d-X (random type, no id) from %" PRIuINUM "\n",
- fs_attr->type + 37, a_addr);
+ fprintf(stderr,
+ "Got unexpected attribute %d-X (random type, no id) from %"
+ PRIuINUM "\n", fs_attr->type + 37, a_addr);
tsk_error_print(stderr);
return 1;
}
else if (tsk_errno != TSK_ERR_FS_ATTR_NOTFOUND) {
- fprintf(stderr, "Unexpected error code %x from getting %d-X (random type, no id) from %" PRIuINUM "\n",
- (int)tsk_errno, fs_attr->type, a_addr);
+ fprintf(stderr,
+ "Unexpected error code %x from getting %d-X (random type, no id) from %"
+ PRIuINUM "\n", (int) tsk_errno, fs_attr->type, a_addr);
tsk_error_print(stderr);
return 1;
}
tsk_error_reset();
}
-
+
tsk_fs_file_close(fs_file);
return retval;
@@ -178,9 +199,7 @@ test_fat12()
char fname[512];
snprintf(fname, 512, "%s/fat12.dd", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
return 1;
@@ -191,13 +210,13 @@ test_fat12()
tsk_error_print(stderr);
return 1;
}
-
+
// verify the APIs get teh same for file 47
if (test_get_apis(fs, 47, 1)) {
fprintf(stderr, "%s failure\n", tname);
return 1;
}
-
+
// verify the one attribte is the expected type
if (test_get_type(fs, 47, TSK_FS_ATTR_TYPE_DEFAULT)) {
fprintf(stderr, "%s failure\n", tname);
@@ -219,9 +238,7 @@ test_ntfs_fe()
char fname[512];
snprintf(fname, 512, "%s/fe_test_1.img", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
return 1;
@@ -250,8 +267,8 @@ test_ntfs_fe()
fprintf(stderr, "%s failure\n", tname);
return 1;
}
-
-
+
+
if (test_get_apis(fs, 9, 7)) {
fprintf(stderr, "%s failure\n", tname);
return 1;
diff --git a/tests/fs_fname_apis.cpp b/tests/fs_fname_apis.cpp
index b2ab4e66f..169e10c98 100644
--- a/tests/fs_fname_apis.cpp
+++ b/tests/fs_fname_apis.cpp
@@ -363,9 +363,7 @@ test_fat12()
char fname[512];
snprintf(fname, 512, "%s/fat12.dd", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
return 1;
@@ -403,9 +401,7 @@ test_ntfs_fe()
char fname[512];
snprintf(fname, 512, "%s/fe_test_1.img", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
return 1;
@@ -442,9 +438,7 @@ test_ntfs_comp()
char fname[512];
snprintf(fname, 512, "%s/ntfs-comp-1.img", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
return 1;
diff --git a/tests/read_apis.cpp b/tests/read_apis.cpp
index 9d1468609..aa4ea029a 100644
--- a/tests/read_apis.cpp
+++ b/tests/read_apis.cpp
@@ -183,7 +183,8 @@ testfile(TSK_FS_INFO * a_fs, TSK_INUM_T a_inum)
s_off = 0;
if (tsk_fs_file_walk(file1, (TSK_FS_FILE_WALK_FLAG_ENUM) 0,
fw_action1, NULL)) {
- fprintf(stderr, "Error walking file inode: %"PRIuINUM"\n", a_inum);
+ fprintf(stderr, "Error walking file inode: %" PRIuINUM "\n",
+ a_inum);
tsk_error_print(stderr);
tsk_error_reset();
return 1;
@@ -206,9 +207,7 @@ test_fat12()
char fname[512];
snprintf(fname, 512, "%s/fat12.dd", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
tsk_error_reset();
@@ -247,9 +246,7 @@ test_fat_slack()
ssize_t retval;
snprintf(fname, 512, "%s/fat-img-kw.dd", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
tsk_error_reset();
@@ -343,9 +340,7 @@ test_fat_recover()
ssize_t retval;
snprintf(fname, 512, "%s/fe_test_1.img", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
tsk_error_reset();
@@ -485,9 +480,7 @@ test_ntfs_slack_ads()
ssize_t retval;
snprintf(fname, 512, "%s/ntfs-img-kw-1.dd", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
tsk_error_reset();
@@ -585,11 +578,11 @@ test_ntfs_slack_ads()
}
// test the getsize API for both attributes
- const TSK_FS_ATTR *fs_attr = tsk_fs_file_attr_get_type(file1, TSK_FS_ATTR_TYPE_NTFS_DATA, 3, 1);
+ const TSK_FS_ATTR *fs_attr =
+ tsk_fs_file_attr_get_type(file1, TSK_FS_ATTR_TYPE_NTFS_DATA, 3, 1);
if (!fs_attr) {
fprintf(stderr,
- "Error getting data attribute 3 in file-n-5.dat (%s)",
- tname);
+ "Error getting data attribute 3 in file-n-5.dat (%s)", tname);
tsk_error_print(stderr);
tsk_error_reset();
return 1;
@@ -601,7 +594,8 @@ test_ntfs_slack_ads()
return 1;
}
- fs_attr = tsk_fs_file_attr_get_type(file1, TSK_FS_ATTR_TYPE_NTFS_DATA, 5, 1);
+ fs_attr =
+ tsk_fs_file_attr_get_type(file1, TSK_FS_ATTR_TYPE_NTFS_DATA, 5, 1);
if (!fs_attr) {
fprintf(stderr,
"Error getting size of attribute 5 in file-n-5.dat (%s)",
@@ -633,9 +627,7 @@ test_ntfs_fe()
char fname[512];
snprintf(fname, 512, "%s/fe_test_1.img", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
tsk_error_reset();
@@ -673,9 +665,7 @@ test_ntfs_comp()
char fname[512];
snprintf(fname, 512, "%s/ntfs-comp-1.img", s_root);
- if ((img =
- tsk_img_open_sing((const TSK_TCHAR *) fname,
- (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
+ if ((img = tsk_img_open_sing(fname, (TSK_IMG_TYPE_ENUM) 0)) == NULL) {
fprintf(stderr, "Error opening %s image\n", tname);
tsk_error_print(stderr);
tsk_error_reset();
diff --git a/tools/fstools/blkcalc.cpp b/tools/fstools/blkcalc.cpp
index 440521b21..62397f3a3 100644
--- a/tools/fstools/blkcalc.cpp
+++ b/tools/fstools/blkcalc.cpp
@@ -56,7 +56,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -72,18 +72,18 @@ main(int argc, char ** argv1)
TSK_DADDR_T count = 0;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
setlocale(LC_ALL, "");
@@ -188,8 +188,7 @@ main(int argc, char ** argv1)
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tools/fstools/blkcat.cpp b/tools/fstools/blkcat.cpp
index 5d8811924..5c32152e7 100644
--- a/tools/fstools/blkcat.cpp
+++ b/tools/fstools/blkcat.cpp
@@ -57,7 +57,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -74,18 +74,18 @@ main(int argc, char ** argv1)
char format = 0;
extern int OPTIND;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
setlocale(LC_ALL, "");
@@ -100,8 +100,8 @@ main(int argc, char ** argv1)
fstype = TSK_FS_TYPE_RAW;
}
else if (TSTRCMP(OPTARG, _TSK_T("list")) == 0) {
- tsk_fprintf(stderr, "\t%"PRIttocTSK" (Unallocated Space)\n",
- BLKLS_TYPE);
+ tsk_fprintf(stderr,
+ "\t%" PRIttocTSK " (Unallocated Space)\n", BLKLS_TYPE);
tsk_fs_type_print(stderr);
exit(1);
}
@@ -195,8 +195,7 @@ main(int argc, char ** argv1)
/* Get the block address */
if (format & TSK_FS_BLKCAT_STAT) {
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -222,8 +221,7 @@ main(int argc, char ** argv1)
}
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -251,8 +249,7 @@ main(int argc, char ** argv1)
}
if ((img =
- tsk_img_open(argc - OPTIND - 2,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 2, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
diff --git a/tools/fstools/blkls.cpp b/tools/fstools/blkls.cpp
index 945ef161a..19541b5c0 100644
--- a/tools/fstools/blkls.cpp
+++ b/tools/fstools/blkls.cpp
@@ -64,7 +64,7 @@ usage()
/* main - open file system, list block info */
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -82,18 +82,18 @@ main(int argc, char ** argv1)
char lclflags = TSK_FS_BLKLS_CAT, set_bounds = 1;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
setlocale(LC_ALL, "");
@@ -174,9 +174,7 @@ main(int argc, char ** argv1)
}
/* There should be no other arguments */
- img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype);
+ img = tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype);
if (img == NULL) {
tsk_error_print(stderr);
@@ -203,8 +201,7 @@ main(int argc, char ** argv1)
if ((dash = TSTRCHR(argv[argc - 1], _TSK_T('-'))) == NULL) {
/* No dash in arg - therefore it is an image file name */
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -227,8 +224,7 @@ main(int argc, char ** argv1)
/* Not a number - consider it a file name */
*dash = _TSK_T('-');
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -251,8 +247,7 @@ main(int argc, char ** argv1)
dash--;
*dash = _TSK_T('-');
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -271,8 +266,7 @@ main(int argc, char ** argv1)
set_bounds = 0;
/* It was a block range, so do not include it in the open */
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
diff --git a/tools/fstools/blkstat.cpp b/tools/fstools/blkstat.cpp
index 405bd3d5a..6d40163b1 100644
--- a/tools/fstools/blkstat.cpp
+++ b/tools/fstools/blkstat.cpp
@@ -41,7 +41,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -58,18 +58,18 @@ main(int argc, char ** argv1)
(TSK_FS_BLOCK_FLAG_UNALLOC | TSK_FS_BLOCK_FLAG_ALLOC |
TSK_FS_BLOCK_FLAG_META | TSK_FS_BLOCK_FLAG_CONT);
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
setlocale(LC_ALL, "");
@@ -133,8 +133,8 @@ main(int argc, char ** argv1)
/* open image */
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
+ imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tools/fstools/ffind.cpp b/tools/fstools/ffind.cpp
index 9bc9c32cc..3725cdb9c 100644
--- a/tools/fstools/ffind.cpp
+++ b/tools/fstools/ffind.cpp
@@ -47,7 +47,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -65,17 +65,17 @@ main(int argc, char ** argv1)
uint8_t ffind_flags = 0;
TSK_INUM_T inode;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -159,8 +159,8 @@ main(int argc, char ** argv1)
/* open image */
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
+ imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tools/fstools/fls.cpp b/tools/fstools/fls.cpp
index 22655c14c..7e574566b 100644
--- a/tools/fstools/fls.cpp
+++ b/tools/fstools/fls.cpp
@@ -63,7 +63,7 @@ usage()
}
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -80,18 +80,18 @@ main(int argc, char ** argv1)
int32_t sec_skew = 0;
static TSK_TCHAR *macpre = NULL;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
setlocale(LC_ALL, "");
@@ -234,8 +234,7 @@ main(int argc, char ** argv1)
if (tsk_fs_parse_inum(argv[argc - 1], &inode, NULL, NULL, NULL, NULL)) {
/* Not an inode at the end */
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -264,8 +263,7 @@ main(int argc, char ** argv1)
}
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
diff --git a/tools/fstools/fscheck.cpp b/tools/fstools/fscheck.cpp
index bf3beadc6..a7f565c14 100644
--- a/tools/fstools/fscheck.cpp
+++ b/tools/fstools/fscheck.cpp
@@ -40,18 +40,18 @@ main(int argc, char **argv)
int ch;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
diff --git a/tools/fstools/fsstat.cpp b/tools/fstools/fsstat.cpp
index f91b3f917..34ee42b98 100644
--- a/tools/fstools/fsstat.cpp
+++ b/tools/fstools/fsstat.cpp
@@ -39,7 +39,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -51,17 +51,17 @@ main(int argc, char ** argv1)
int ch;
uint8_t type = 0;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -128,8 +128,7 @@ main(int argc, char ** argv1)
}
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tools/fstools/icat.cpp b/tools/fstools/icat.cpp
index aec6455a6..9b400c907 100644
--- a/tools/fstools/icat.cpp
+++ b/tools/fstools/icat.cpp
@@ -53,7 +53,7 @@ usage()
}
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -71,17 +71,17 @@ main(int argc, char ** argv1)
int retval;
int suppress_recover_error = 0;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -151,15 +151,16 @@ main(int argc, char ** argv1)
}
/* Get the inode address */
- if (tsk_fs_parse_inum(argv[argc - 1], &inum, &type, &type_used, &id, &id_used)) {
+ if (tsk_fs_parse_inum(argv[argc - 1], &inum, &type, &type_used, &id,
+ &id_used)) {
TFPRINTF(stderr, _TSK_T("Invalid inode address: %s\n"),
argv[argc - 1]);
usage();
}
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
+ imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
@@ -194,7 +195,9 @@ main(int argc, char ** argv1)
exit(1);
}
- retval = tsk_fs_icat(fs, inum, type, type_used, id, id_used, (TSK_FS_FILE_WALK_FLAG_ENUM)fw_flags);
+ retval =
+ tsk_fs_icat(fs, inum, type, type_used, id, id_used,
+ (TSK_FS_FILE_WALK_FLAG_ENUM) fw_flags);
if (retval) {
if ((suppress_recover_error == 1)
&& (tsk_errno == TSK_ERR_FS_RECOVER)) {
diff --git a/tools/fstools/ifind.cpp b/tools/fstools/ifind.cpp
index 15b1c3bd6..ef40f7468 100644
--- a/tools/fstools/ifind.cpp
+++ b/tools/fstools/ifind.cpp
@@ -60,7 +60,7 @@ usage()
#define IFIND_PARENT 0x04
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -77,17 +77,17 @@ main(int argc, char ** argv1)
TSK_INUM_T parinode = 0;
TSK_TCHAR *path = NULL;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -218,8 +218,7 @@ main(int argc, char ** argv1)
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype)) == NULL) {
tsk_error_print(stderr);
if (path)
free(path);
diff --git a/tools/fstools/ils.cpp b/tools/fstools/ils.cpp
index ab74f31c2..7098a09de 100644
--- a/tools/fstools/ils.cpp
+++ b/tools/fstools/ils.cpp
@@ -65,7 +65,7 @@ usage()
/* main - open file system, list inode info */
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -83,17 +83,17 @@ main(int argc, char ** argv1)
TSK_TCHAR *image = NULL;
int32_t sec_skew = 0;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -212,8 +212,7 @@ main(int argc, char ** argv1)
/* Not a number - consider it a file name */
image = argv[OPTIND];
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -231,8 +230,7 @@ main(int argc, char ** argv1)
set_range = 0;
image = argv[OPTIND];
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -255,8 +253,7 @@ main(int argc, char ** argv1)
*dash = _TSK_T('-');
image = argv[OPTIND];
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -277,8 +274,7 @@ main(int argc, char ** argv1)
*dash = '-';
image = argv[OPTIND];
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -295,8 +291,7 @@ main(int argc, char ** argv1)
/* It was a block range, so do not include it in the open */
image = argv[OPTIND];
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
diff --git a/tools/fstools/istat.cpp b/tools/fstools/istat.cpp
index d4ae40dd7..0b21b6aba 100644
--- a/tools/fstools/istat.cpp
+++ b/tools/fstools/istat.cpp
@@ -51,7 +51,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -68,17 +68,17 @@ main(int argc, char ** argv1)
/* When > 0 this is the number of blocks to print, used for -b arg */
TSK_DADDR_T numblock = 0;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -174,8 +174,8 @@ main(int argc, char ** argv1)
* Open the file system.
*/
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
+ imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tools/fstools/jcat.cpp b/tools/fstools/jcat.cpp
index d801ae674..eb7de4839 100644
--- a/tools/fstools/jcat.cpp
+++ b/tools/fstools/jcat.cpp
@@ -42,7 +42,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -56,17 +56,17 @@ main(int argc, char ** argv1)
TSK_DADDR_T blk;
TSK_TCHAR *cp;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -133,8 +133,7 @@ main(int argc, char ** argv1)
if (tsk_fs_parse_inum(argv[argc - 2], &inum, NULL, NULL, NULL, NULL)) {
/* Not a number therefore an image */
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -157,8 +156,7 @@ main(int argc, char ** argv1)
}
else {
if ((img =
- tsk_img_open(argc - OPTIND - 2,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 2, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
diff --git a/tools/fstools/jls.cpp b/tools/fstools/jls.cpp
index b342f9c6d..65b24040a 100644
--- a/tools/fstools/jls.cpp
+++ b/tools/fstools/jls.cpp
@@ -35,7 +35,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
TSK_IMG_INFO *img;
@@ -47,17 +47,17 @@ main(int argc, char ** argv1)
TSK_INUM_T inum;
int ch;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
setlocale(LC_ALL, "");
@@ -122,8 +122,7 @@ main(int argc, char ** argv1)
if (tsk_fs_parse_inum(argv[argc - 1], &inum, NULL, NULL, NULL, NULL)) {
/* Not an inode at the end */
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
@@ -147,8 +146,7 @@ main(int argc, char ** argv1)
}
else {
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND],
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
diff --git a/tools/imgtools/img_cat.cpp b/tools/imgtools/img_cat.cpp
index aab491b3e..672e23c13 100644
--- a/tools/imgtools/img_cat.cpp
+++ b/tools/imgtools/img_cat.cpp
@@ -31,7 +31,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_INFO *img;
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
@@ -39,16 +39,16 @@ main(int argc, char ** argv1)
TSK_OFF_T done;
ssize_t cnt;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
progname = argv[0];
@@ -91,17 +91,15 @@ main(int argc, char ** argv1)
}
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
#ifdef TSK_WIN32
if (-1 == _setmode(_fileno(stdout), _O_BINARY)) {
- fprintf(stderr,
- "error setting stdout to binary: %s",
- strerror(errno));
+ fprintf(stderr,
+ "error setting stdout to binary: %s", strerror(errno));
exit(1);
}
#endif
@@ -110,7 +108,7 @@ main(int argc, char ** argv1)
char buf[16 * 1024];
size_t len;
- if (done + (TSK_OFF_T)sizeof(buf) > img->size) {
+ if (done + (TSK_OFF_T) sizeof(buf) > img->size) {
len = (size_t) (img->size - done);
}
else {
@@ -118,7 +116,7 @@ main(int argc, char ** argv1)
}
cnt = tsk_img_read(img, done, buf, len);
- if (cnt != (ssize_t)len) {
+ if (cnt != (ssize_t) len) {
if (cnt >= 0) {
tsk_fprintf(stderr,
"img_cat: Error reading image file at offset: %"
@@ -133,7 +131,7 @@ main(int argc, char ** argv1)
}
if (fwrite(buf, cnt, 1, stdout) != 1) {
- fprintf(stderr,
+ fprintf(stderr,
"img_cat: Error writing to stdout: %s", strerror(errno));
tsk_img_close(img);
exit(1);
diff --git a/tools/imgtools/img_stat.cpp b/tools/imgtools/img_stat.cpp
index a793abde1..5cd9f8c36 100644
--- a/tools/imgtools/img_stat.cpp
+++ b/tools/imgtools/img_stat.cpp
@@ -28,25 +28,25 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_IMG_INFO *img;
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
int ch;
uint8_t type = 0;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
while ((ch = GETOPT(argc, argv, _TSK_T("i:tvV"))) > 0) {
@@ -91,8 +91,7 @@ main(int argc, char ** argv1)
}
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tools/vstools/mmcat.cpp b/tools/vstools/mmcat.cpp
index c0d917063..a34b5a010 100644
--- a/tools/vstools/mmcat.cpp
+++ b/tools/vstools/mmcat.cpp
@@ -33,7 +33,7 @@ usage()
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_VS_INFO *vs;
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
@@ -46,18 +46,18 @@ main(int argc, char ** argv1)
const TSK_VS_PART_INFO *vs_part;
char *buf;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
@@ -117,8 +117,8 @@ main(int argc, char ** argv1)
/* open the image */
if ((img =
- tsk_img_open(argc - OPTIND - 1,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND - 1, &argv[OPTIND],
+ imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tools/vstools/mmls.cpp b/tools/vstools/mmls.cpp
index ca133ce2c..2e42d5fc8 100644
--- a/tools/vstools/mmls.cpp
+++ b/tools/vstools/mmls.cpp
@@ -142,7 +142,7 @@ print_header(const TSK_VS_INFO * vs)
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_VS_INFO *vs;
int ch;
@@ -153,18 +153,18 @@ main(int argc, char ** argv1)
TSK_VS_TYPE_ENUM vstype = TSK_VS_TYPE_DETECT;
uint8_t hide_meta = 0;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
+ argv = (TSK_TCHAR **) argv1;
#endif
-
+
progname = argv[0];
@@ -251,9 +251,7 @@ main(int argc, char ** argv1)
}
/* open the image */
- img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype);
+ img = tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype);
if (img == NULL) {
tsk_error_print(stderr);
diff --git a/tools/vstools/mmstat.cpp b/tools/vstools/mmstat.cpp
index 7b349de2a..e11857ae9 100644
--- a/tools/vstools/mmstat.cpp
+++ b/tools/vstools/mmstat.cpp
@@ -40,7 +40,7 @@ print_stats(const TSK_VS_INFO * vs)
}
int
-main(int argc, char ** argv1)
+main(int argc, char **argv1)
{
TSK_VS_INFO *vs;
TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
@@ -49,17 +49,17 @@ main(int argc, char ** argv1)
TSK_OFF_T imgoff = 0;
TSK_IMG_INFO *img;
TSK_TCHAR **argv;
-
+
#ifdef TSK_WIN32
// On Windows, get the wide arguments (mingw doesn't support wmain)
argv = CommandLineToArgvW(GetCommandLineW(), &argc);
- if( argv == NULL) {
+ if (argv == NULL) {
fprintf(stderr, "Error getting wide arguments\n");
exit(1);
}
#else
- argv = (TSK_TCHAR **)argv1;
-#endif
+ argv = (TSK_TCHAR **) argv1;
+#endif
progname = argv[0];
@@ -118,8 +118,7 @@ main(int argc, char ** argv1)
/* open the image */
if ((img =
- tsk_img_open(argc - OPTIND,
- (const TSK_TCHAR **) &argv[OPTIND], imgtype)) == NULL) {
+ tsk_img_open(argc - OPTIND, &argv[OPTIND], imgtype)) == NULL) {
tsk_error_print(stderr);
exit(1);
}
diff --git a/tsk3/img/aff.c b/tsk3/img/aff.c
index e6f609f0a..2d2dd6a32 100644
--- a/tsk3/img/aff.c
+++ b/tsk3/img/aff.c
@@ -217,7 +217,7 @@ aff_close(TSK_IMG_INFO * img_info)
TSK_IMG_INFO *
-aff_open(const char **images)
+aff_open(const char *const images[])
{
IMG_AFF_INFO *aff_info;
TSK_IMG_INFO *img_info;
diff --git a/tsk3/img/aff.h b/tsk3/img/aff.h
index c05b174c4..172581c33 100644
--- a/tsk3/img/aff.h
+++ b/tsk3/img/aff.h
@@ -19,7 +19,7 @@
#include <afflib/afflib.h>
#include <afflib/afflib_i.h>
-extern TSK_IMG_INFO *aff_open(const char **);
+extern TSK_IMG_INFO *aff_open(const char *const images[]);
/** \internal
* Stores AFF-specific data
diff --git a/tsk3/img/ewf.c b/tsk3/img/ewf.c
index 82e29f137..a54fc140a 100644
--- a/tsk3/img/ewf.c
+++ b/tsk3/img/ewf.c
@@ -124,7 +124,7 @@ img_file_header_signature_ncmp(const char *filename,
TSK_IMG_INFO *
-ewf_open(int num_img, const TSK_TCHAR ** images)
+ewf_open(int num_img, const TSK_TCHAR * const images[])
{
IMG_EWF_INFO *ewf_info;
TSK_IMG_INFO *img_info;
diff --git a/tsk3/img/ewf.h b/tsk3/img/ewf.h
index 8358dd9b6..19dca3f4a 100644
--- a/tsk3/img/ewf.h
+++ b/tsk3/img/ewf.h
@@ -30,7 +30,7 @@
extern "C" {
#endif
- extern TSK_IMG_INFO *ewf_open(int, const TSK_TCHAR **);
+ extern TSK_IMG_INFO *ewf_open(int, const TSK_TCHAR * const images[]);
typedef struct {
TSK_IMG_INFO img_info;
diff --git a/tsk3/img/img_io.c b/tsk3/img/img_io.c
index 552b5ba03..f85418abf 100644
--- a/tsk3/img/img_io.c
+++ b/tsk3/img/img_io.c
@@ -48,7 +48,7 @@ tsk_img_read(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_off,
* we'll use this length when checking the cache. */
len2 = a_len;
if (a_off + len2 > a_img_info->size)
- len2 = (size_t)(a_img_info->size - a_off);
+ len2 = (size_t) (a_img_info->size - a_off);
// check if it is in the cache
for (i = 0; i < TSK_IMG_INFO_CACHE_NUM; i++) {
@@ -62,16 +62,16 @@ tsk_img_read(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_off,
a_off + len2)) {
/*
- if (tsk_verbose)
- fprintf(stderr,
- "tsk_img_read: Read found in cache %d\n", i);
+ if (tsk_verbose)
+ fprintf(stderr,
+ "tsk_img_read: Read found in cache %d\n", i);
*/
// We found it...
memcpy(a_buf,
&a_img_info->cache[i][a_off -
a_img_info->cache_off[i]], len2);
- retval = (ssize_t)len2;
+ retval = (ssize_t) len2;
// reset its "age" since it was useful
a_img_info->cache_age[i] = CACHE_AGE;
@@ -104,16 +104,18 @@ tsk_img_read(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_off,
a_img_info->cache_off[cache_next] = (a_off / 512) * 512;
/*
- if (tsk_verbose)
- fprintf(stderr,
- "tsk_img_read: Loading data into cache %d (%" PRIuOFF
- ")\n", cache_next, a_img_info->cache_off[cache_next]);
+ if (tsk_verbose)
+ fprintf(stderr,
+ "tsk_img_read: Loading data into cache %d (%" PRIuOFF
+ ")\n", cache_next, a_img_info->cache_off[cache_next]);
*/
// figure out the length to read into the cache
rlen = TSK_IMG_INFO_CACHE_LEN;
if (a_img_info->cache_off[cache_next] + rlen > a_img_info->size) {
- rlen = (size_t)(a_img_info->size - a_img_info->cache_off[cache_next]);
+ rlen =
+ (size_t) (a_img_info->size -
+ a_img_info->cache_off[cache_next]);
}
retval =
@@ -127,12 +129,14 @@ tsk_img_read(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_off,
// update the length we can actually copy (in case we did not get to read all that we wanted)
if (a_off + len2 > a_img_info->cache_off[cache_next] + retval)
- len2 = (size_t)(a_img_info->cache_off[cache_next] + retval - a_off);
+ len2 =
+ (size_t) (a_img_info->cache_off[cache_next] + retval -
+ a_off);
memcpy(a_buf,
&a_img_info->cache[cache_next][a_off -
a_img_info->cache_off[cache_next]], len2);
- retval = (ssize_t)len2;
+ retval = (ssize_t) len2;
}
else {
a_img_info->cache_len[cache_next] = 0;
diff --git a/tsk3/img/img_open.c b/tsk3/img/img_open.c
index a17bdc7b8..7d6111881 100644
--- a/tsk3/img/img_open.c
+++ b/tsk3/img/img_open.c
@@ -45,7 +45,8 @@ typedef int bool;
TSK_IMG_INFO *
tsk_img_open_sing(const TSK_TCHAR * a_image, TSK_IMG_TYPE_ENUM type)
{
- return tsk_img_open(1, &a_image, type);
+ const TSK_TCHAR *const a = a_image;
+ return tsk_img_open(1, &a, type);
}
@@ -68,7 +69,7 @@ tsk_img_open_sing(const TSK_TCHAR * a_image, TSK_IMG_TYPE_ENUM type)
*/
TSK_IMG_INFO *
tsk_img_open(int num_img,
- const TSK_TCHAR ** images, TSK_IMG_TYPE_ENUM type)
+ const TSK_TCHAR * const images[], TSK_IMG_TYPE_ENUM type)
{
TSK_IMG_INFO *img_info = NULL;
@@ -269,7 +270,8 @@ tsk_img_open(int num_img,
TSK_IMG_INFO *
tsk_img_open_utf8_sing(const char *a_image, TSK_IMG_TYPE_ENUM type)
{
- return tsk_img_open_utf8(1, &a_image, type);
+ const char *const a = a_image;
+ return tsk_img_open_utf8(1, &a, type);
}
@@ -287,7 +289,8 @@ tsk_img_open_utf8_sing(const char *a_image, TSK_IMG_TYPE_ENUM type)
* @return Pointer to TSK_IMG_INFO or NULL on error
*/
TSK_IMG_INFO *
-tsk_img_open_utf8(int num_img, const char **images, TSK_IMG_TYPE_ENUM type)
+tsk_img_open_utf8(int num_img, const char *const images[],
+ TSK_IMG_TYPE_ENUM type)
{
#ifdef TSK_WIN32
{
@@ -362,7 +365,7 @@ tsk_img_open_utf8(int num_img, const char **images, TSK_IMG_TYPE_ENUM type)
*/
TSK_IMG_INFO *
tsk_img_open_utf16(int num_img,
- const wchar_t ** images, TSK_IMG_TYPE_ENUM type)
+ wchar_t * const images[], TSK_IMG_TYPE_ENUM type)
{
#if TSK_WIN32
return tsk_img_open(num_img, images, type);
diff --git a/tsk3/img/raw.c b/tsk3/img/raw.c
index 515f1d005..6e20eb292 100644
--- a/tsk3/img/raw.c
+++ b/tsk3/img/raw.c
@@ -307,12 +307,12 @@ raw_open(const TSK_TCHAR * image)
}
}
}
-#else
+#else
/* We don't use the stat output because it doesn't work on raw
* devices and such */
img_info->size = lseek(raw_info->fd, 0, SEEK_END);
lseek(raw_info->fd, 0, SEEK_SET);
-#endif
+#endif
#endif
raw_info->seek_pos = 0;
diff --git a/tsk3/img/split.c b/tsk3/img/split.c
index 0ee6fcabf..10f68f0a2 100644
--- a/tsk3/img/split.c
+++ b/tsk3/img/split.c
@@ -60,16 +60,18 @@ split_read_segment(IMG_SPLIT_INFO * split_info, int idx, char *buf,
#ifdef TSK_WIN32
if ((cimg->fd = CreateFile(split_info->images[idx], FILE_READ_DATA,
- FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) {
+ FILE_SHARE_READ, NULL, OPEN_EXISTING, 0,
+ NULL)) == INVALID_HANDLE_VALUE) {
tsk_error_reset();
tsk_errno = TSK_ERR_IMG_OPEN;
snprintf(tsk_errstr, TSK_ERRSTR_L,
"split_read file: %" PRIttocTSK " msg: %d",
- split_info->images[idx], (int)GetLastError());
+ split_info->images[idx], (int) GetLastError());
return -1;
}
#else
- if ((cimg->fd = open(split_info->images[idx], O_RDONLY | O_BINARY)) < 0) {
+ if ((cimg->fd =
+ open(split_info->images[idx], O_RDONLY | O_BINARY)) < 0) {
tsk_error_reset();
tsk_errno = TSK_ERR_IMG_OPEN;
snprintf(tsk_errstr, TSK_ERRSTR_L,
@@ -333,7 +335,7 @@ split_close(TSK_IMG_INFO * img_info)
* @return NULL on error
*/
TSK_IMG_INFO *
-split_open(int num_img, const TSK_TCHAR ** images)
+split_open(int num_img, const TSK_TCHAR * const images[])
{
IMG_SPLIT_INFO *split_info;
TSK_IMG_INFO *img_info;
diff --git a/tsk3/img/split.h b/tsk3/img/split.h
index 5732dc57d..4ae25f0c7 100644
--- a/tsk3/img/split.h
+++ b/tsk3/img/split.h
@@ -18,7 +18,7 @@
extern "C" {
#endif
- extern TSK_IMG_INFO *split_open(int, const TSK_TCHAR **);
+ extern TSK_IMG_INFO *split_open(int, const TSK_TCHAR * const images[]);
#define SPLIT_CACHE 15
@@ -35,7 +35,7 @@ extern "C" {
typedef struct {
TSK_IMG_INFO img_info;
int num_img;
- const TSK_TCHAR **images;
+ const TSK_TCHAR *const *images;
TSK_OFF_T *max_off;
int *cptr; /* exists for each image - points to entry in cache */
IMG_SPLIT_CACHE cache[SPLIT_CACHE]; /* small number of fds for open images */
diff --git a/tsk3/img/tsk_img.h b/tsk3/img/tsk_img.h
index ae76e2bd2..1d457dfe2 100644
--- a/tsk3/img/tsk_img.h
+++ b/tsk3/img/tsk_img.h
@@ -94,11 +94,11 @@ extern "C" {
extern TSK_IMG_INFO *tsk_img_open_sing(const TSK_TCHAR * a_image,
TSK_IMG_TYPE_ENUM type);
extern TSK_IMG_INFO *tsk_img_open(int,
- const TSK_TCHAR **, TSK_IMG_TYPE_ENUM);
+ const TSK_TCHAR * const images[], TSK_IMG_TYPE_ENUM);
extern TSK_IMG_INFO *tsk_img_open_utf8_sing(const char *a_image,
TSK_IMG_TYPE_ENUM type);
extern TSK_IMG_INFO *tsk_img_open_utf8(int num_img,
- const char **images, TSK_IMG_TYPE_ENUM type);
+ const char *const images[], TSK_IMG_TYPE_ENUM type);
extern void tsk_img_close(TSK_IMG_INFO *);
--
GitLab