2003-11-03 Zoltan Varga <vargaz@freemail.hu>

	* reflection.c (create_dynamic_mono_image): Call mono_image_init to
	avoid code duplication.

svn path=/trunk/mono/; revision=19595

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 172f249fa67ba2fd61cb831671409da34f6c007a..e3eaae4e14d3fbfbc720ecc86416569ea323757d 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,8 @@
 2003-11-03  Zoltan Varga  <vargaz@freemail.hu>
 
+       * reflection.c (create_dynamic_mono_image): Call mono_image_init to 
+       avoid code duplication.
+
        * reflection.h (MonoDynamicImage): New type which is currently unused,
        but will be used through the ref.emit code in place of 
        MonoDynamicAssembly.

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 6d8cf94884379fb6098c1dcf8459ed69482ff356..f98df94c018b41f27433735ef6812bdd5c9b5104 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -3256,28 +3256,7 @@ create_dynamic_mono_image (char *assembly_name, char *module_name)
        image->image.references = g_new0 (MonoAssembly*, 1);
        image->image.references [0] = NULL;
 
-       image->image.method_cache = g_hash_table_new (NULL, NULL);
-       image->image.class_cache = g_hash_table_new (NULL, NULL);
-       image->image.name_cache = g_hash_table_new (g_str_hash, g_str_equal);
-       image->image.array_cache = g_hash_table_new (NULL, NULL);
-
-       image->image.delegate_begin_invoke_cache = 
-               g_hash_table_new ((GHashFunc)mono_signature_hash, 
-                                 (GCompareFunc)mono_metadata_signature_equal);
-       image->image.delegate_end_invoke_cache = 
-               g_hash_table_new ((GHashFunc)mono_signature_hash, 
-                                 (GCompareFunc)mono_metadata_signature_equal);
-       image->image.delegate_invoke_cache = 
-               g_hash_table_new ((GHashFunc)mono_signature_hash, 
-                                 (GCompareFunc)mono_metadata_signature_equal);
-
-       image->image.runtime_invoke_cache = g_hash_table_new (NULL, NULL);
-       image->image.managed_wrapper_cache = g_hash_table_new (NULL, NULL);
-       image->image.native_wrapper_cache = g_hash_table_new (NULL, NULL);
-       image->image.remoting_invoke_cache = g_hash_table_new (NULL, NULL);
-       image->image.synchronized_cache = g_hash_table_new (NULL, NULL);
-
-       image->image.generics_cache = g_hash_table_new ((GHashFunc)mono_metadata_type_hash, (GEqualFunc)mono_metadata_type_equal);
+       mono_image_init (&image->image);
 
        image->token_fixups = mono_g_hash_table_new (NULL, NULL);
        image->method_to_table_idx = mono_g_hash_table_new (NULL, NULL);