[MonoError] add mono_error_vset_type_load_class function

A variant of mono_error_set_type_load_class that takes a va_list
argument instead of varargs.

diff --git a/mono/utils/mono-error-internals.h b/mono/utils/mono-error-internals.h
index ee1a370f5e26d1d0068d3ad8cbbd5eee87bd6e39..c74923c00944b34d83aa5c2da0cc4a2fa19931d4 100644 (file)
--- a/mono/utils/mono-error-internals.h
+++ b/mono/utils/mono-error-internals.h
@@ -74,6 +74,9 @@ mono_error_set_assembly_load_simple (MonoError *error, const char *assembly_name
 void
 mono_error_set_type_load_class (MonoError *error, MonoClass *klass, const char *msg_format, ...) MONO_ATTR_FORMAT_PRINTF(3,4);
 
+void
+mono_error_vset_type_load_class (MonoError *error, MonoClass *klass, const char *msg_format, va_list args);
+
 void
 mono_error_set_type_load_name (MonoError *error, const char *type_name, const char *assembly_name, const char *msg_format, ...) MONO_ATTR_FORMAT_PRINTF(4,5);
 

diff --git a/mono/utils/mono-error.c b/mono/utils/mono-error.c
index 04a30cb5861cb6131687d9f20efad67a3b3f7b61..6ef0381f440e85b510151ffc8c510627cb1a165e 100644 (file)
--- a/mono/utils/mono-error.c
+++ b/mono/utils/mono-error.c
@@ -302,13 +302,22 @@ mono_error_set_assembly_load_simple (MonoError *oerror, const char *assembly_nam
 
 void
 mono_error_set_type_load_class (MonoError *oerror, MonoClass *klass, const char *msg_format, ...)
+{
+       va_list args;
+       va_start (args, msg_format);
+       mono_error_vset_type_load_class (oerror, klass, msg_format, args);
+       va_end (args);
+}
+
+void
+mono_error_vset_type_load_class (MonoError *oerror, MonoClass *klass, const char *msg_format, va_list args)
 {
        MonoErrorInternal *error = (MonoErrorInternal*)oerror;
        mono_error_prepare (error);
 
        error->error_code = MONO_ERROR_TYPE_LOAD;
        mono_error_set_class (oerror, klass);
-       set_error_message ();
+       set_error_messagev ();
 }
 
 /*