2005-01-05 Zoltan Varga <vargaz@freemail.hu>

	* metadata.c (mono_type_to_unmanaged): Improve error message for
	invalid string marshalling.

	* metadata.c: Fix warnings.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index e3b527bd03da72c4ab087f2cade55580206b2069..29555687826ff23b637618585bf0dfde162dd0b9 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,4 +1,10 @@
+2005-01-05  Zoltan Varga  <vargaz@freemail.hu>
+
+       * metadata.c (mono_type_to_unmanaged): Improve error message for 
+       invalid string marshalling.
 
+       * metadata.c: Fix warnings.
+       
 Wed Jan 5 16:17:27 CET 2005 Paolo Molaro <lupus@ximian.com>
 
        * profiler-private.h, profiler.c, profiler.h, gc.c: sample statistical

diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c
index 523bec047179b46f0e840cb2847a3fc09e0a45e5..e8461c283182546ca080754719741aff2eb3c673 100644 (file)
--- a/mono/metadata/metadata.c
+++ b/mono/metadata/metadata.c
@@ -1606,7 +1606,6 @@ MonoGenericClass *
 mono_metadata_lookup_generic_class (MonoGenericClass *gclass)
 {
        MonoGenericClass *cached;
-       int i;
 
        cached = g_hash_table_lookup (generic_class_cache, gclass);
        if (cached)
@@ -1619,7 +1618,7 @@ mono_metadata_lookup_generic_class (MonoGenericClass *gclass)
 MonoGenericInst *
 mono_metadata_inflate_generic_inst (MonoGenericInst *ginst, MonoGenericContext *context)
 {
-       MonoGenericInst *nginst, *cached;
+       MonoGenericInst *nginst;
        int i;
 
        nginst = g_new0 (MonoGenericInst, 1);
@@ -1668,12 +1667,10 @@ do_mono_metadata_parse_generic_class (MonoType *type, MonoImage *m, MonoGenericC
                                      const char *ptr, const char **rptr)
 {
        MonoGenericClass *gclass = g_new0 (MonoGenericClass, 1);
-       MonoGenericContainer *container;
        MonoGenericClass *cached;
-       MonoGenericInst *ginst;
        MonoClass *gklass;
        MonoType *gtype;
-       int i, count;
+       int count;
 
        type->data.generic_class = gclass;
 
@@ -3568,7 +3565,7 @@ handle_enum:
                                        *conv = MONO_MARSHAL_CONV_STR_BYVALSTR;
                                return MONO_NATIVE_BYVALTSTR;
                        default:
-                               g_error ("cant marshal string to native type %02x", mspec->native);
+                               g_error ("Can not marshal string to native type '%02x': Invalid managed/unmanaged type combination (String fields must be paired with LPStr, LPWStr, BStr or ByValTStr).", mspec->native);
                        }
                }       
                *conv = MONO_MARSHAL_CONV_STR_LPTSTR;
@@ -3792,7 +3789,6 @@ mono_metadata_load_generic_params (MonoImage *image, guint32 token, MonoGenericC
        guint32 cols [MONO_GENERICPARAM_SIZE];
        guint32 i, owner = 0, last_num, n;
        MonoGenericContainer *container;
-       MonoGenericClass *gclass;
        MonoGenericParam *params;
 
        if (mono_metadata_token_table (token) == MONO_TABLE_TYPEDEF)