diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp index 87b3b9f3d0b0760a948942094aaf9fb68e1d3693..92e932f8399d1e2da9f45f85afc676ea46e948c7 100755 --- a/tsk/auto/auto_db.cpp +++ b/tsk/auto/auto_db.cpp @@ -222,61 +222,62 @@ TskAutoDb::addImageDetails(const char* deviceId) sha1 = ewf_info->sha1hash; } - char *res = libewf_read_unique_description(ewf_info->handle); - collectionDetails.append(res); - free(res); + char * header_result = libewf_read_description(ewf_info->handle); - res = libewf_read_case_number(ewf_info->handle); - collectionDetails.append(res); - free(res); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_evidence_number(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_case_number(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_examiner_name(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_evidence_number(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_notes(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_examiner_name(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_model(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_notes(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_serial_number(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_model(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_device_label(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_serial_number(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_version(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_device_label(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_platform(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_version(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_acquired_date(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_platform(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_system_date(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_acquired_date(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_acquiry_operating_system(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_system_date(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); - res = libewf_read_acquiry_software_version(ewf_info->handle); - collectionDetails.append(res); - free(res); + header_result = libewf_read_acquiry_operating_system(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); + + header_result = libewf_read_acquiry_software_version(ewf_info->handle); + collectionDetails.append(header_result); + free(header_result); } #endif diff --git a/tsk/img/tsk_img_i.h b/tsk/img/tsk_img_i.h index 2af8e1d07a2a2e0436226368605402ca2a89908d..2b3b39329da0ed36d0d0427e76a632d1e489e7b0 100755 --- a/tsk/img/tsk_img_i.h +++ b/tsk/img/tsk_img_i.h @@ -74,7 +74,7 @@ inline char* read_libewf_header_value(libewf_handle_t *handle, const uint8_t *id return result_str; } -inline char* libewf_read_unique_description(libewf_handle_t *handle) { +inline char* libewf_read_description(libewf_handle_t *handle) { return read_libewf_header_value(handle, (uint8_t *) "description", 11, "Description: "); }