[PATCH 2/3] reg: Replace heap_xrealloc() with heap_realloc()
Hugh McMaster
hugh.mcmaster at outlook.com
Fri Mar 19 06:32:38 CDT 2021
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 5aa84eed5b1..0927705a2e2 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 = heap_realloc(value_name, max_value_len * sizeof(WCHAR));
}
else break;
}
diff --git a/programs/reg/export.c b/programs/reg/export.c
index 10d3ca75eb4..36b866a0d4c 100644
--- a/programs/reg/export.c
+++ b/programs/reg/export.c
@@ -267,12 +267,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 = heap_realloc(data, max_data_bytes);
}
else
{
max_value_len *= 2;
- value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR));
+ value_name = heap_realloc(value_name, max_value_len * sizeof(WCHAR));
}
}
else break;
diff --git a/programs/reg/import.c b/programs/reg/import.c
index 9bcc8b63421..22babb189f1 100644
--- a/programs/reg/import.c
+++ b/programs/reg/import.c
@@ -192,7 +192,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 = heap_realloc(parser->data, size);
s = *str;
d = (BYTE *)parser->data + parser->data_size;
@@ -903,7 +903,7 @@ static WCHAR *get_lineA(FILE *fp)
if (size - len < 3)
{
size *= 2;
- buf = heap_xrealloc(buf, size);
+ buf = heap_realloc(buf, size);
}
if (!(count = fread(buf + len, 1, size - len - 1, fp)))
{
@@ -959,7 +959,7 @@ static WCHAR *get_lineW(FILE *fp)
if (size - len < 3)
{
size *= 2;
- buf = heap_xrealloc(buf, size * sizeof(WCHAR));
+ buf = heap_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 0c1432d4e2d..26f88968b97 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 = heap_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 = heap_realloc(data, max_data_bytes);
}
else
{
max_value_len *= 2;
- value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR));
+ value_name = heap_realloc(value_name, max_value_len * sizeof(WCHAR));
}
}
else break;
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 3c8971d4e2a..cb24d9552f5 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -69,19 +69,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 280c0654109..7137bd7bef6 100644
--- a/programs/reg/reg.h
+++ b/programs/reg/reg.h
@@ -33,7 +33,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
More information about the wine-devel
mailing list