Review feedback.

Author: lateralusX

src/mono/mono/eglib/eglib-remap.h

@@ -261,6 +261,7 @@
 #define g_usleep monoeg_g_usleep
 #define g_utf16_to_ucs4 monoeg_g_utf16_to_ucs4
 #define g_utf16_to_utf8 monoeg_g_utf16_to_utf8
+#define g_utf16_to_utf8_custom_alloc monoeg_g_utf16_to_utf8_custom_alloc
 #define g_utf16_ascii_equal monoeg_g_utf16_ascii_equal
 #define g_utf16_asciiz_equal monoeg_g_utf16_asciiz_equal
 #define g_utf8_jump_table monoeg_g_utf8_jump_table
@@ -272,6 +273,7 @@
 #define g_utf8_strup monoeg_g_utf8_strup
 #define g_utf8_to_ucs4_fast monoeg_g_utf8_to_ucs4_fast
 #define g_utf8_to_utf16 monoeg_g_utf8_to_utf16
+#define g_utf8_to_utf16_custom_alloc monoeg_g_utf8_to_utf16_custom_alloc
 #define g_utf8_validate monoeg_g_utf8_validate
 #define g_unichar_to_utf8 monoeg_g_unichar_to_utf8
 #define g_unichar_is_space monoeg_g_unichar_is_space

src/mono/mono/eglib/giconv.c

@@ -919,7 +919,7 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
 
 error:
 	if (errno == ENOMEM) {
-		g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ALLOC_FAILED,
+		g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_MEMORY,
 			     "Allocation failed.");
 	} else if (errno == EILSEQ) {
 		g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
@@ -1103,7 +1103,7 @@ g_utf16_to_utf8_general (const gunichar2 *str, glong len, glong *items_read, glo
 		outptr = outbuf = custom_alloc_func (outlen + 1, custom_alloc_data);
 
 	if (G_UNLIKELY (custom_alloc_func && !outbuf)) {
-		g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ALLOC_FAILED, "Allocation failed.");
+		g_set_error (err, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_MEMORY, "Allocation failed.");
 		if (items_written)
 			*items_written = 0;
 		return NULL;

src/mono/mono/eglib/glib.h

@@ -1005,7 +1005,7 @@ typedef enum {
 	G_CONVERT_ERROR_PARTIAL_INPUT,
 	G_CONVERT_ERROR_BAD_URI,
 	G_CONVERT_ERROR_NOT_ABSOLUTE_PATH,
-	G_CONVERT_ERROR_ALLOC_FAILED
+	G_CONVERT_ERROR_NO_MEMORY
 } GConvertError;
 
 gchar     *g_utf8_strup (const gchar *str, gssize len);
@@ -1038,21 +1038,21 @@ typedef struct {
 	gpointer buffer;
 	gsize buffer_size;
 	gsize req_buffer_size;
-} GConvertDefaultCustomAllocatorData;
+} GConvertFixedBufferCustomAllocatorData;
 
 static
 gpointer
-g_converter_default_custom_allocator_func (gsize req_size, gpointer custom_alloc_data)
+g_converter_fixed_buffer_custom_allocator_func (gsize req_size, gpointer custom_alloc_data)
 {
-	GConvertDefaultCustomAllocatorData *default_custom_alloc_data = (GConvertDefaultCustomAllocatorData *)custom_alloc_data;
-	if (!default_custom_alloc_data)
+	GConvertFixedBufferCustomAllocatorData *fixed_buffer_custom_alloc_data = (GConvertFixedBufferCustomAllocatorData *)custom_alloc_data;
+	if (!fixed_buffer_custom_alloc_data)
 		return NULL;
 
-	default_custom_alloc_data->req_buffer_size = req_size;
-	if (req_size > default_custom_alloc_data->buffer_size)
+	fixed_buffer_custom_alloc_data->req_buffer_size = req_size;
+	if (req_size > fixed_buffer_custom_alloc_data->buffer_size)
 		return NULL;
 
-	return default_custom_alloc_data->buffer;
+	return fixed_buffer_custom_alloc_data->buffer;
 }
 
 gunichar2 *g_utf8_to_utf16_custom_alloc (const gchar *str, glong len, glong *items_read, glong *items_written, GConvertCustomAllocator custom_alloc_func, gpointer custom_alloc_data, GError **err);

src/mono/mono/eglib/gmodule-win32.c

@@ -172,11 +172,11 @@ g_module_address (void *addr, char *file_name, size_t file_name_len,
 		DWORD bytes = GetModuleFileNameW (module, fname, G_N_ELEMENTS (fname));
 		if (bytes) {
 			/* Convert back to UTF-8 from wide for runtime */
-			GConvertDefaultCustomAllocatorData custom_alloc_data;
+			GConvertFixedBufferCustomAllocatorData custom_alloc_data;
 			custom_alloc_data.buffer = file_name;
 			custom_alloc_data.buffer_size = file_name_len;
 			custom_alloc_data.req_buffer_size = 0;
-			if (!g_utf16_to_utf8_custom_alloc (fname, -1, NULL, NULL, g_converter_default_custom_allocator_func, &custom_alloc_data, NULL))
+			if (!g_utf16_to_utf8_custom_alloc (fname, -1, NULL, NULL, g_converter_fixed_buffer_custom_allocator_func, &custom_alloc_data, NULL))
 				*file_name = '\0';
 		} else {
 			*file_name = '\0';

src/mono/mono/eventpipe/ep-rt-mono.c

@@ -607,17 +607,17 @@ write_buffer_string_utf8_t (
 	if (!value)
 		return true;
 
-	GConvertDefaultCustomAllocatorData custom_alloc_data;
+	GConvertFixedBufferCustomAllocatorData custom_alloc_data;
 	custom_alloc_data.buffer = *buffer + *offset;
 	custom_alloc_data.buffer_size = *size - *offset;
 	custom_alloc_data.req_buffer_size = 0;
 
-	if (!g_utf8_to_utf16_custom_alloc (value, -1, NULL, NULL, g_converter_default_custom_allocator_func, &custom_alloc_data, NULL)) {
+	if (!g_utf8_to_utf16_custom_alloc (value, -1, NULL, NULL, g_converter_fixed_buffer_custom_allocator_func, &custom_alloc_data, NULL)) {
 		ep_raise_error_if_nok (resize_buffer (buffer, size, *offset, *size + custom_alloc_data.req_buffer_size, fixed_buffer));
 		custom_alloc_data.buffer = *buffer + *offset;
 		custom_alloc_data.buffer_size = *size - *offset;
 		custom_alloc_data.req_buffer_size = 0;
-		ep_raise_error_if_nok (g_utf8_to_utf16_custom_alloc (value, -1, NULL, NULL, g_converter_default_custom_allocator_func, &custom_alloc_data, NULL) != NULL);
+		ep_raise_error_if_nok (g_utf8_to_utf16_custom_alloc (value, -1, NULL, NULL, g_converter_fixed_buffer_custom_allocator_func, &custom_alloc_data, NULL) != NULL);
 	}
 
 	*offset += custom_alloc_data.req_buffer_size;

src/mono/mono/metadata/domain-internals.h

@@ -668,7 +668,7 @@ MonoJitInfo* mono_jit_info_table_find_internal (MonoDomain *domain, gpointer add
 typedef void (*MonoJitInfoFunc) (MonoJitInfo *ji, gpointer user_data);
 
 void
-jit_info_table_foreach (MonoDomain *domain, MonoJitInfoFunc func, gpointer user_data);
+mono_jit_info_table_foreach_internal (MonoDomain *domain, MonoJitInfoFunc func, gpointer user_data);
 
 void mono_enable_debug_domain_unload (gboolean enable);
 

src/mono/mono/metadata/icall-eventpipe.c

@@ -462,7 +462,7 @@ eventpipe_execute_rundown (
 		events_data.buffer_size = 1024 * sizeof(uint32_t);
 		events_data.buffer = g_new (uint8_t, events_data.buffer_size);
 		events_data.method_events_func = method_events_func;
-		jit_info_table_foreach (root_domain, eventpipe_fire_method_events_func, &events_data);
+		mono_jit_info_table_foreach_internal (root_domain, eventpipe_fire_method_events_func, &events_data);
 		g_free (events_data.buffer);
 
 		// Iterate all assemblies in domain.

src/mono/mono/metadata/jit-info.c

@@ -338,7 +338,7 @@ mono_jit_info_table_find (MonoDomain *domain, gpointer addr)
 }
 
 void
-jit_info_table_foreach (MonoDomain *domain, MonoJitInfoFunc func, gpointer user_data)
+mono_jit_info_table_foreach_internal (MonoDomain *domain, MonoJitInfoFunc func, gpointer user_data)
 {
 	MonoJitInfoTable *table;
 	MonoJitInfo *ji;