From e94f59070663c0131d2623ec527a3f0ebe4a3d3c Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Thu, 21 Feb 2019 16:54:34 -0500
Subject: [PATCH] Renamed a variable and a function

---
 tsk/auto/auto_db.cpp | 85 ++++++++++++++++++++++----------------------
 tsk/img/tsk_img_i.h  |  2 +-
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 87b3b9f3d..92e932f83 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 2af8e1d07..2b3b39329 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: ");
 }
 
-- 
GitLab