[mono/mono] 0ab26779: Prefix internal variables with `mono_`.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/8ff7f5748c0c...0ab267799464

   Commit: 0ab267799464abb2a569295ae25fa5ae30c1c9b5
   Author: Alex Rønne Petersen <[email protected]> 
     Date: 2013-10-24 15:28:51 GMT
      URL: https://github.com/mono/mono/commit/0ab267799464abb2a569295ae25fa5ae30c1c9b5

Prefix internal variables with `mono_`.

Changed paths:
  M mono/mini/driver.c
  M mono/mini/mini.c
  M mono/mini/mini.h

Modified: mono/mini/driver.c
===================================================================
@@ -481,7 +481,7 @@
 
 	total = 0;
 	*total_run = 0;
-	if (do_single_method_regression) {
+	if (mono_do_single_method_regression) {
 		GSList *iter;
 
 		mini_regression_step (image, verbose, total_run, &total,
@@ -489,14 +489,14 @@
 				timer, domain);
 		if (total)
 			return total;
-		g_print ("Single method regression: %d methods\n", g_slist_length (single_method_list));
+		g_print ("Single method regression: %d methods\n", g_slist_length (mono_single_method_list));
 
-		for (iter = single_method_list; iter; iter = g_slist_next (iter)) {
+		for (iter = mono_single_method_list; iter; iter = g_slist_next (iter)) {
 			char *method_name;
 
-			current_single_method = iter->data;
+			mono_current_single_method = iter->data;
 
-			method_name = mono_method_full_name (current_single_method, TRUE);
+			method_name = mono_method_full_name (mono_current_single_method, TRUE);
 			g_print ("Current single method: %s\n", method_name);
 			g_free (method_name);
 
@@ -1533,7 +1533,7 @@ BOOL APIENTRY DllMain (HMODULE module_handle, DWORD reason, LPVOID reserved)
 		} else if (strncmp (argv [i], "--single-method=", 16) == 0) {
 			char *full_opts = g_strdup_printf ("-all,%s", argv [i] + 16);
 			action = DO_SINGLE_METHOD_REGRESSION;
-			single_method_regression_opt = parse_optimizations (full_opts);
+			mono_single_method_regression_opt = parse_optimizations (full_opts);
 			g_free (full_opts);
 		} else if (strcmp (argv [i], "--verbose") == 0 || strcmp (argv [i], "-v") == 0) {
 			mini_verbose++;
@@ -1928,7 +1928,7 @@ BOOL APIENTRY DllMain (HMODULE module_handle, DWORD reason, LPVOID reserved)
 	
 	switch (action) {
 	case DO_SINGLE_METHOD_REGRESSION:
-		do_single_method_regression = TRUE;
+		mono_do_single_method_regression = TRUE;
 	case DO_REGRESSION:
 		if (mini_regression_list (mini_verbose, argc -i, argv + i)) {
 			g_print ("Regression ERRORS!\n");

Modified: mono/mini/mini.c
===================================================================
@@ -6306,30 +6306,30 @@ void *mono_global_codeman_reserve (int size)
 	return NULL;
 }
 
-gboolean do_single_method_regression = FALSE;
-guint32 single_method_regression_opt = 0;
-MonoMethod *current_single_method = NULL;
-GSList *single_method_list = NULL;
-GHashTable *single_method_hash = NULL;
+gboolean mono_do_single_method_regression = FALSE;
+guint32 mono_single_method_regression_opt = 0;
+MonoMethod *mono_current_single_method = NULL;
+GSList *mono_single_method_list = NULL;
+GHashTable *mono_single_method_hash = NULL;
 
 guint32
 mono_get_optimizations_for_method (MonoMethod *method, guint32 default_opt)
 {
 	g_assert (method);
 
-	if (!do_single_method_regression)
+	if (!mono_do_single_method_regression)
 		return default_opt;
-	if (!current_single_method) {
-		if (!single_method_hash)
-			single_method_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-		if (!g_hash_table_lookup (single_method_hash, method)) {
-			g_hash_table_insert (single_method_hash, method, method);
-			single_method_list = g_slist_prepend (single_method_list, method);
+	if (!mono_current_single_method) {
+		if (!mono_single_method_hash)
+			mono_single_method_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+		if (!g_hash_table_lookup (mono_single_method_hash, method)) {
+			g_hash_table_insert (mono_single_method_hash, method, method);
+			mono_single_method_list = g_slist_prepend (mono_single_method_list, method);
 		}
 		return default_opt;
 	}
-	if (method == current_single_method)
-		return single_method_regression_opt;
+	if (method == mono_current_single_method)
+		return mono_single_method_regression_opt;
 	return default_opt;
 }
 

Modified: mono/mini/mini.h
===================================================================
@@ -526,11 +526,11 @@ enum {
 extern const char *mono_build_date;
 extern gboolean mono_do_signal_chaining;
 extern gboolean mono_use_llvm;
-extern gboolean do_single_method_regression;
-extern guint32 single_method_regression_opt;
-extern MonoMethod *current_single_method;
-extern GSList *single_method_list;
-extern GHashTable *single_method_hash;
+extern gboolean mono_do_single_method_regression;
+extern guint32 mono_single_method_regression_opt;
+extern MonoMethod *mono_current_single_method;
+extern GSList *mono_single_method_list;
+extern GHashTable *mono_single_method_hash;
 
 #define INS_INFO(opcode) (&ins_info [((opcode) - OP_START - 1) * 4])
 
_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches