[PATCH 8/8] regedit: Export value names from the export_data() function

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/regproc.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index c72675e4c3..a58110b748 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -1313,9 +1313,11 @@ static void export_newline(FILE *fp, BOOL unicode)
     REGPROC_write_line(fp, newline, unicode);
 }
 
-static void export_data(FILE *fp, DWORD type, size_t line_len, void *data, size_t size, BOOL unicode)
+static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type,
+                        void *data, size_t size, BOOL unicode)
 {
     WCHAR *buf = NULL;
+    size_t line_len = export_value_name(fp, value_name, value_len, unicode);
 
     switch (type)
     {
@@ -1393,10 +1395,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode)
         data_size = max_data_bytes;
         rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size);
         if (rc == ERROR_SUCCESS)
-        {
-            size_t line_len = export_value_name(fp, value_name, value_len, unicode);
-            export_data(fp, type, line_len, data, data_size, unicode);
-        }
+            export_data(fp, value_name, value_len, type, data, data_size, unicode);
     }
 
     HeapFree(GetProcessHeap(), 0, data);
-- 
2.11.0