[PATCH 2/6 v2] reg: Use realloc() instead of heap_xrealloc()

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/reg/delete.c |  2 +-
 programs/reg/export.c |  4 ++--
 programs/reg/import.c |  6 +++---
 programs/reg/query.c  |  6 +++---
 programs/reg/reg.c    | 13 -------------
 programs/reg/reg.h    |  1 -
 6 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/programs/reg/delete.c b/programs/reg/delete.c
index ba3e7dbab7b..429cb84fb53 100644
--- a/programs/reg/delete.c
+++ b/programs/reg/delete.c
@@ -85,7 +85,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,
             else if (rc == ERROR_MORE_DATA)
             {
                 max_value_len *= 2;
-                value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR));
+                value_name = realloc(value_name, max_value_len * sizeof(WCHAR));
             }
             else break;
         }
diff --git a/programs/reg/export.c b/programs/reg/export.c
index 741b2539931..763ac996aec 100644
--- a/programs/reg/export.c
+++ b/programs/reg/export.c
@@ -266,12 +266,12 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path)
             if (data_size > max_data_bytes)
             {
                 max_data_bytes = data_size;
-                data = heap_xrealloc(data, max_data_bytes);
+                data = realloc(data, max_data_bytes);
             }
             else
             {
                 max_value_len *= 2;
-                value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR));
+                value_name = realloc(value_name, max_value_len * sizeof(WCHAR));
             }
         }
         else break;
diff --git a/programs/reg/import.c b/programs/reg/import.c
index a3a115ffb4f..5f6b52f7f41 100644
--- a/programs/reg/import.c
+++ b/programs/reg/import.c
@@ -191,7 +191,7 @@ static BOOL convert_hex_csv_to_hex(struct parser *parser, WCHAR **str)
 
     /* The worst case is 1 digit + 1 comma per byte */
     size = ((lstrlenW(*str) + 1) / 2) + parser->data_size;
-    parser->data = heap_xrealloc(parser->data, size);
+    parser->data = realloc(parser->data, size);
 
     s = *str;
     d = (BYTE *)parser->data + parser->data_size;
@@ -902,7 +902,7 @@ static WCHAR *get_lineA(FILE *fp)
             if (size - len < 3)
             {
                 size *= 2;
-                buf = heap_xrealloc(buf, size);
+                buf = realloc(buf, size);
             }
             if (!(count = fread(buf + len, 1, size - len - 1, fp)))
             {
@@ -958,7 +958,7 @@ static WCHAR *get_lineW(FILE *fp)
             if (size - len < 3)
             {
                 size *= 2;
-                buf = heap_xrealloc(buf, size * sizeof(WCHAR));
+                buf = realloc(buf, size * sizeof(WCHAR));
             }
             if (!(count = fread(buf + len, sizeof(WCHAR), size - len - 1, fp)))
             {
diff --git a/programs/reg/query.c b/programs/reg/query.c
index 02ea03c947c..3ad05eafe21 100644
--- a/programs/reg/query.c
+++ b/programs/reg/query.c
@@ -155,7 +155,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse)
         if (rc == ERROR_MORE_DATA)
         {
             max_data_bytes = data_size;
-            data = heap_xrealloc(data, max_data_bytes);
+            data = realloc(data, max_data_bytes);
         }
         else break;
     }
@@ -246,12 +246,12 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse)
             if (data_size > max_data_bytes)
             {
                 max_data_bytes = data_size;
-                data = heap_xrealloc(data, max_data_bytes);
+                data = realloc(data, max_data_bytes);
             }
             else
             {
                 max_value_len *= 2;
-                value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR));
+                value_name = realloc(value_name, max_value_len * sizeof(WCHAR));
             }
         }
         else break;
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 1ea0d9a3eb6..ba812641ad8 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -68,19 +68,6 @@ const struct reg_type_rels type_rels[] =
     {REG_MULTI_SZ, type_multi_sz},
 };
 
-void *heap_xrealloc(void *buf, size_t size)
-{
-    void *new_buf = heap_realloc(buf, size);
-
-    if (!new_buf)
-    {
-        ERR("Out of memory!\n");
-        exit(1);
-    }
-
-    return new_buf;
-}
-
 void output_writeconsole(const WCHAR *str, DWORD wlen)
 {
     DWORD count, ret;
diff --git a/programs/reg/reg.h b/programs/reg/reg.h
index e6f9606c370..dda1a45b737 100644
--- a/programs/reg/reg.h
+++ b/programs/reg/reg.h
@@ -34,7 +34,6 @@ struct reg_type_rels {
 
 extern const struct reg_type_rels type_rels[8];
 
-void *heap_xrealloc(void *buf, size_t size);
 void output_writeconsole(const WCHAR *str, DWORD wlen);
 void WINAPIV output_message(unsigned int id, ...);
 void WINAPIV output_string(const WCHAR *fmt, ...);
-- 
2.31.0