From: Zoltan Varga <vargaz@gmail.com>
Date: Wed, 29 Feb 2012 12:04:08 +0000 (+0100)
Subject: Fix warnings reported by clang.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=1cdafa6797495b40ec0f9dde1a86d614a9d0d6c6;p=mono.git

Fix warnings reported by clang.
---

diff --git a/eglib/src/gutf8.c b/eglib/src/gutf8.c
index 052229d5274..ea3e9bcfd87 100644
--- a/eglib/src/gutf8.c
+++ b/eglib/src/gutf8.c
@@ -290,7 +290,7 @@ g_utf8_find_prev_char (const gchar *str, const gchar *p)
 {
 	while (p > str) {
 		p--;
-		if ((*p && 0xc0) != 0xb0)
+		if ((*p & 0xc0) != 0xb0)
 			return (gchar *)p;
 	}
 	return NULL;
diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c
index ed38b48b122..f54d08c7991 100644
--- a/mono/metadata/debug-mono-symfile.c
+++ b/mono/metadata/debug-mono-symfile.c
@@ -648,8 +648,6 @@ _mono_debug_address_from_il_offset (MonoDebugMethodJitInfo *jit, uint32_t il_off
 	for (i = jit->num_line_numbers - 1; i >= 0; i--) {
 		MonoDebugLineNumberEntry lne = jit->line_numbers [i];
 
-		if (lne.il_offset < 0)
-			continue;
 		if (lne.il_offset <= il_offset)
 			return lne.native_offset;
 	}
diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index 4a6e8596ccc..5303d5da271 100644
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -2074,7 +2074,7 @@ mono_domain_free (MonoDomain *domain, gboolean force)
 
 	mono_perfcounters->loader_appdomains--;
 
-	if ((domain == mono_root_domain))
+	if (domain == mono_root_domain)
 		mono_root_domain = NULL;
 }
 
diff --git a/mono/metadata/mono-hash.c b/mono/metadata/mono-hash.c
index 7263e8cc952..a640239d655 100644
--- a/mono/metadata/mono-hash.c
+++ b/mono/metadata/mono-hash.c
@@ -137,7 +137,7 @@ mono_g_hash_table_new_type (GHashFunc hash_func, GEqualFunc key_equal_func, Mono
 	hash->gc_type = type;
 
 #ifdef HAVE_SGEN_GC
-	if (type < 0 || type > MONO_HASH_KEY_VALUE_GC)
+	if (type > MONO_HASH_KEY_VALUE_GC)
 		g_error ("wrong type for gc hashtable");
 	/*
 	 * We use a user defined marking function to avoid having to register a GC root for
diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 016f3a16815..7d562d98e23 100644
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -5191,7 +5191,7 @@ mono_object_isinst_mbyref (MonoObject *obj, MonoClass *klass)
 			return obj;
 	} else {
 		MonoClass *oklass = vt->klass;
-		if ((oklass == mono_defaults.transparent_proxy_class))
+		if (oklass == mono_defaults.transparent_proxy_class)
 			oklass = ((MonoTransparentProxy *)obj)->remote_class->proxy_class;
 
 		mono_class_setup_supertypes (klass);	
diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index e0880966136..74e74bead7b 100644
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -4930,7 +4930,7 @@ mono_image_create_token (MonoDynamicImage *assembly, MonoObject *obj,
 		if (tb->generic_params) {
 			token = mono_image_get_generic_field_token (assembly, fb);
 		} else {
-			if ((tb->module->dynamic_image == assembly)) {
+			if (tb->module->dynamic_image == assembly) {
 				token = fb->table_idx | MONO_TOKEN_FIELD_DEF;
 			} else {
 				token = mono_image_get_fieldref_token (assembly, (MonoObject*)fb, fb->handle);
diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index 48e35fffb2e..03c515d057c 100644
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -830,7 +830,7 @@ mono_sgen_scan_area_with_callback (char *start, char *end, IterateObjectCallback
 
 		size = ALIGN_UP (safe_object_get_size ((MonoObject*)obj));
 
-		if (SGEN_LOAD_VTABLE (obj) != array_fill_vtable)
+		if ((MonoVTable*)SGEN_LOAD_VTABLE (obj) != array_fill_vtable)
 			callback (obj, size, data);
 
 		start += size;
diff --git a/mono/metadata/tpool-poll.c b/mono/metadata/tpool-poll.c
index d819aa94b2a..44f1a15d806 100644
--- a/mono/metadata/tpool-poll.c
+++ b/mono/metadata/tpool-poll.c
@@ -83,7 +83,7 @@ tp_poll_modify (gpointer event_data, int fd, int operation, int events, gboolean
 	INIT_POLLFD (&data->newpfd, GPOINTER_TO_INT (fd), events);
 	*msg = (char) operation;
 #ifndef HOST_WIN32
-	if (write (data->pipe [1], msg, 1));
+	write (data->pipe [1], msg, 1);
 #else
 	send ((SOCKET) data->pipe [1], msg, 1, 0);
 #endif