2003-02-06 Piers Haken <piersh@friskit.com>

	* appdomain.[ch]:
	* class.h:
	* debug-mono-symfile.c:
	* icall.c:
	* loader.c:
	* mono-config.c:
	* monosn.c:
	* reflection.c:
	* socket-io.c: warning cleanups

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index c841194b05e8ea1adeecedecf6c37b8c0b7ff0f5..29324921c30f19025bd0c2683382c1738e729b0e 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-06  Piers Haken        <piersh@friskit.com>
+
+       * appdomain.[ch]:
+       * class.h:
+       * debug-mono-symfile.c:
+       * icall.c:
+       * loader.c:
+       * mono-config.c:
+       * monosn.c:
+       * reflection.c:
+       * socket-io.c: warning cleanups
+
 2003-02-06  Dietmar Maurer  <dietmar@ximian.com>
 
        * marshal.c (mono_marshal_get_remoting_invoke_with_check): new

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index c853b53c3ae2c99ccb3b41107f8585c1b4392f31..8c8d2ed734957c2a3d305f46597c4f289c3442ed 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -34,6 +34,9 @@ mono_domain_assembly_preload (MonoAssemblyName *aname,
 static void
 mono_domain_fire_assembly_load (MonoAssembly *assembly, gpointer user_data);
 
+static MonoMethod *
+look_for_method_by_name (MonoClass *klass, const gchar *name);
+
 /*
  * mono_runtime_init:
  * @domain: domain returned by mono_init ()
@@ -237,7 +240,7 @@ ves_icall_System_AppDomain_getCurDomain ()
 MonoAppDomain *
 ves_icall_System_AppDomain_createDomain (MonoString *friendly_name, MonoAppDomainSetup *setup)
 {
-       MonoDomain *domain = mono_domain_get (); 
+       /*MonoDomain *domain = mono_domain_get (); */
        MonoClass *adclass;
        MonoAppDomain *ad;
        MonoDomain *data;
@@ -781,7 +784,7 @@ ves_icall_System_AppDomain_ExecuteAssembly (MonoAppDomain *ad, MonoString *file,
                g_error ("No entry point method found in %s", image->name);
 
        if (!args)
-               args = (MonoObject *) mono_array_new (ad->data, mono_defaults.string_class, 0);
+               args = (MonoArray *) mono_array_new (ad->data, mono_defaults.string_class, 0);
 
        res = mono_runtime_exec_main (method, (MonoArray *)args, NULL);
 

diff --git a/mono/metadata/appdomain.h b/mono/metadata/appdomain.h
index bae637e7bd862590db5758e2ec49c19743646941..ca4f021f6ceca5247feca34afce3452aa406b757 100644 (file)
--- a/mono/metadata/appdomain.h
+++ b/mono/metadata/appdomain.h
@@ -211,4 +211,7 @@ ves_icall_System_AppDomain_InternalGetContext      (void);
 MonoAppContext * 
 ves_icall_System_AppDomain_InternalSetContext     (MonoAppContext *mc);
 
+gint32 
+ves_icall_System_AppDomain_GetIDFromDomain (MonoAppDomain * ad);
+
 #endif /* _MONO_METADATA_APPDOMAIN_H_ */

diff --git a/mono/metadata/class.h b/mono/metadata/class.h
index 70a158c4bcf7961a9fe8ece0437408a08536d52e..ce422e70251324fe1eef8f8b435801d062e44282 100644 (file)
--- a/mono/metadata/class.h
+++ b/mono/metadata/class.h
@@ -273,4 +273,7 @@ mono_lookup_dynamic_token (MonoImage *image, guint32 token);
 void
 mono_install_lookup_dynamic_token (MonoLookupDynamicToken func);
 
+void    
+mono_install_get_config_dir(void);
+
 #endif /* _MONO_CLI_CLASS_H_ */

diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c
index 348d987c76fe333fc20cdb30599b4064e23b0c90..f793a7d0b1abe06e775ae57fdfa5af5505b54966 100644 (file)
--- a/mono/metadata/debug-mono-symfile.c
+++ b/mono/metadata/debug-mono-symfile.c
@@ -461,7 +461,7 @@ mono_debug_symfile_add_method (MonoSymbolFile *symfile, MonoMethod *method)
        } else {
                g_assert ((header != NULL) || (mep->entry->num_locals == 0));
                for (i = 0; i < mep->entry->num_locals; i++) {
-                       MonoDebugVarInfo *var = &mep->minfo->jit->locals [i];
+                       /*MonoDebugVarInfo *var = &mep->minfo->jit->locals [i];*/
                        *var_table++ = mep->minfo->jit->locals [i];
                        *type_table++ = write_type (symfile->global, header->locals [i]);
                }

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 3066cdbe8c2d075ff321a6ef2373b564ce5404a2..da2b0c7469d2f12aa3bb04a848a49f0099bfd9e9 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -3027,7 +3027,7 @@ ves_icall_RuntimeMethod_GetFunctionPointer (MonoMethod *method)
        return mono_compile_method (method);
 }
 
-char * mono_cfg_dir = "";
+char const * mono_cfg_dir = "";
 
 void    
 mono_install_get_config_dir (void)

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index a9c6c6a1cfee6a55df6bf282892a4d9ce3b75a82..c8d08a8dcdf415a66621c0c96aca274c6203631c 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -47,7 +47,7 @@ mono_add_internal_call (const char *name, gconstpointer method)
                icall_hash = g_hash_table_new (g_str_hash , g_str_equal);
        }
 
-       g_hash_table_insert (icall_hash, g_strdup (name), method);
+       g_hash_table_insert (icall_hash, g_strdup (name), (gpointer) method);
 }
 
 static void

diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c
index 10aefa3a45a94f335729c868a7cb4843bed7f6c8..eee6fab161c24ccc741a2886b2d41858e1b1e418 100644 (file)
--- a/mono/metadata/mono-config.c
+++ b/mono/metadata/mono-config.c
@@ -208,7 +208,7 @@ mono_config_init (void)
 {
        inited = 1;
        config_handlers = g_hash_table_new (g_str_hash, g_str_equal);
-       g_hash_table_insert (config_handlers, dllmap_handler.element_name, &dllmap_handler);
+       g_hash_table_insert (config_handlers, (gpointer) dllmap_handler.element_name, (gpointer) &dllmap_handler);
 }
 
 /* FIXME: error handling */

diff --git a/mono/metadata/monosn.c b/mono/metadata/monosn.c
index 7ac5bfcbecc4106c5ce0bd75333782348a937bab..936b98e5f5d6d22dabff9de5ca40b5cc49408e2e 100644 (file)
--- a/mono/metadata/monosn.c
+++ b/mono/metadata/monosn.c
@@ -408,7 +408,7 @@ convert_format (const char *from, const char *outfile) {
        int binlen, ret, lenout;
        FILE *file;
        
-       if (!g_file_get_contents (from, &key, &len, NULL)) {
+       if (!g_file_get_contents (from, (gchar**) &key, &len, NULL)) {
                printf ("Cannot load file: %s\n", from);
                return 2;
        }
@@ -461,7 +461,7 @@ get_digest (const char *from, const char *outfile)
                snsize = 0;
        }
        
-       if (!g_file_get_contents (from, &ass, &len, NULL)) {
+       if (!g_file_get_contents (from, (gchar**) &ass, &len, NULL)) {
                printf ("Cannot load file: %s\n", from);
                mono_image_close (image);
                return 2;

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 12f9f5e055c558d0f5366e1f25447b475bb9f0e9..072e0ffe7a3a1996fb86f4739f2938ff10395b40 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -1026,7 +1026,7 @@ handle_enum:
                        g_free (swapped);
                }
 #else
-               idx = add_to_blob_cached (assembly, blob_size, b-blob_size, (const char*)mono_string_chars (str), len);
+               idx = add_to_blob_cached (assembly, blob_size, b-blob_size, (char*)mono_string_chars (str), len);
 #endif
 
                g_free (buf);
@@ -2683,7 +2683,7 @@ mono_image_basic_init (MonoReflectionAssemblyBuilder *assemblyb)
 
        string_heap_init (&assembly->sheap);
        mono_image_add_stream_data (&assembly->us, "", 1);
-       add_to_blob_cached (assembly, "", 1, NULL, 0);
+       add_to_blob_cached (assembly, (char*) "", 1, NULL, 0);
        /* import tables... */
        mono_image_add_stream_data (&assembly->code, entrycode, sizeof (entrycode));
        assembly->iat_offset = mono_image_add_stream_zero (&assembly->code, 8); /* two IAT entries */

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index 815bdd6e5068e6ac9c275ac7f1a02ed02109cf72..045a0eb95dbdd9bdf6f45ed931c9701764436f19 100644 (file)
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -769,7 +769,7 @@ static struct sockaddr *create_sockaddr_from_object(MonoObject *saddr_obj,
                sun->sun_path [len - 2] = '\0';
                *sa_size = sizeof (struct sockaddr_un);
 
-               return sun;
+               return (struct sockaddr *)sun;
 #endif
        } else {
                mono_raise_exception(get_socket_exception(WSAEAFNOSUPPORT));