Skip to content
Snippets Groups Projects
Commit 72cdc9d9 authored by Joel Uckelman's avatar Joel Uckelman
Browse files

Cleanup.

parent 7305e4c3
Branches
Tags
No related merge requests found
......@@ -255,9 +255,8 @@ TSK_WALK_RET_ENUM
return TSK_WALK_STOP;
// process it
TSK_RETVAL_ENUM retval2 =
tsk->findFilesInFsRet(a_vs_part->start *
a_vs_part->vs->block_size, TSK_FS_TYPE_DETECT);
TSK_RETVAL_ENUM retval2 = tsk->findFilesInFsRet(
a_vs_part->start * a_vs_part->vs->block_size, TSK_FS_TYPE_DETECT);
if ((retval2 == TSK_STOP) || (tsk->getStopProcessing())) {
return TSK_WALK_STOP;
}
......@@ -360,8 +359,10 @@ TSK_RETVAL_ENUM
return TSK_ERR;
}
else if (getCurVsPartFlag() & TSK_VS_PART_FLAG_ALLOC) {
tsk_error_set_errstr2 ("Sector offset: %" PRIuOFF ", Partition Type: %s",
a_start/512, getCurVsPartDescr().c_str() );
tsk_error_set_errstr2 (
"Sector offset: %" PRIuOFF ", Partition Type: %s",
a_start/512, getCurVsPartDescr().c_str()
);
registerError();
return TSK_ERR;
}
......
......@@ -272,13 +272,9 @@ tsk_vs_part_walk(TSK_VS_INFO * a_vs, TSK_PNUM_T a_start, TSK_PNUM_T a_last,
for (part = a_vs->part_list; part != NULL; part = part->next) {
if ((part->addr >= a_start) && ((part->flags & a_flags) != 0)) {
int retval;
retval = a_action(a_vs, part, a_ptr);
if (retval == TSK_WALK_STOP) {
return 0;
}
else if (retval == TSK_WALK_ERROR) {
return 1;
switch (a_action(a_vs, part, a_ptr)) {
case TSK_WALK_STOP: return 0;
case TSK_WALK_ERROR: return 1;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment