Skip to content
Snippets Groups Projects
Commit d6880a0f authored by Brian Carrier's avatar Brian Carrier
Browse files

Fixed HFS compile warnings on Win32

parent 7097a4b5
Branches
Tags
No related merge requests found
...@@ -1857,7 +1857,6 @@ hfs_load_attrs(TSK_FS_FILE * fs_file) ...@@ -1857,7 +1857,6 @@ hfs_load_attrs(TSK_FS_FILE * fs_file)
0)) { 0)) {
strncat(tsk_errstr2, " - hfs_load_attrs (non-file)", strncat(tsk_errstr2, " - hfs_load_attrs (non-file)",
TSK_ERRSTR_L - strlen(tsk_errstr2)); TSK_ERRSTR_L - strlen(tsk_errstr2));
tsk_fs_attr_run_free(attr_run);
return 1; return 1;
} }
fs_file->meta->attr_state = TSK_FS_META_ATTR_STUDIED; fs_file->meta->attr_state = TSK_FS_META_ATTR_STUDIED;
...@@ -1906,7 +1905,7 @@ hfs_load_attrs(TSK_FS_FILE * fs_file) ...@@ -1906,7 +1905,7 @@ hfs_load_attrs(TSK_FS_FILE * fs_file)
} }
// see if extents file has additional runs // see if extents file has additional runs
if (hfs_ext_find_extent_record_attr(hfs, fs_file->meta->addr, fs_attr)) { if (hfs_ext_find_extent_record_attr(hfs, (uint32_t)fs_file->meta->addr, fs_attr)) {
strncat(tsk_errstr2, " - hfs_load_attrs", strncat(tsk_errstr2, " - hfs_load_attrs",
TSK_ERRSTR_L - strlen(tsk_errstr2)); TSK_ERRSTR_L - strlen(tsk_errstr2));
fs_file->meta->attr_state = TSK_FS_META_ATTR_ERROR; fs_file->meta->attr_state = TSK_FS_META_ATTR_ERROR;
...@@ -1990,7 +1989,7 @@ hfs_block_is_alloc(HFS_INFO * hfs, TSK_DADDR_T a_addr) ...@@ -1990,7 +1989,7 @@ hfs_block_is_alloc(HFS_INFO * hfs, TSK_DADDR_T a_addr)
hfs->blockmap_cache_start = b; hfs->blockmap_cache_start = b;
hfs->blockmap_cache_len = cnt; hfs->blockmap_cache_len = cnt;
} }
b2 = b - hfs->blockmap_cache_start; b2 = (size_t)(b - hfs->blockmap_cache_start);
return (hfs->blockmap_cache[b2] & (1 << (7 - (a_addr % 8)))) != 0; return (hfs->blockmap_cache[b2] & (1 << (7 - (a_addr % 8)))) != 0;
} }
......
...@@ -499,7 +499,7 @@ typedef struct { ...@@ -499,7 +499,7 @@ typedef struct {
TSK_FS_FILE *blockmap_file; TSK_FS_FILE *blockmap_file;
const TSK_FS_ATTR *blockmap_attr; const TSK_FS_ATTR *blockmap_attr;
char blockmap_cache[4096]; ///< Cache for blockmap char blockmap_cache[4096]; ///< Cache for blockmap
int blockmap_cache_start; ///< Byte offset of blockmap where cache starts TSK_OFF_T blockmap_cache_start; ///< Byte offset of blockmap where cache starts
size_t blockmap_cache_len; ///< Length of cache that is being used size_t blockmap_cache_len; ///< Length of cache that is being used
TSK_FS_FILE *catalog_file; TSK_FS_FILE *catalog_file;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment