Fix warnings reported by clang.

diff --git a/eglib/src/gutf8.c b/eglib/src/gutf8.c
index 052229d52741850a9b4a98d8a153e5b223bcb368..ea3e9bcfd877db1659b20ec31774bed32a605473 100644 (file)
--- 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 ed38b48b12290f8833b953285b0b82d1e056a157..f54d08c799135e20a4c4135ef02795454b8ec7d8 100644 (file)
--- 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 4a6e8596ccc1ccbc7aa5465adbfe804e631ff40d..5303d5da2714c1ef09c3125689a71787e0087903 100644 (file)
--- 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 7263e8cc952e2d869e4a0d765a2c095d524cfdd6..a640239d655b98d153157713f7921d0e0c6224a5 100644 (file)
--- 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 016f3a16815fd68407a55fe8276f09371037082f..7d562d98e23b48c2b1f3e80ddd4cb5f2b1f7930d 100644 (file)
--- 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 e0880966136b73046ee2b2e1fa1e1e6066c2fbd6..74e74bead7bcc550195e280204c2f3c63e85fbc6 100644 (file)
--- 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 48e35fffb2e14ba6f684a7f4fec087e7ba1cee1b..03c515d057c846592a0d6fcbce5c50e28720e460 100644 (file)
--- 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 d819aa94b2a2aa3257891bc178687dc4e9cbc10b..44f1a15d80631396518d9e88b2a3a0100e55f625 100644 (file)
--- 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