From ef2d2ddfda38ed2e5efd758be66a9f381d3cf043 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Wed, 7 Oct 2009 12:47:01 +0000
Subject: [PATCH] 	* evas: Remove some llvm warning.

SVN revision: 42938
---
 legacy/evas/src/lib/canvas/evas_object_smart.c              | 6 ++++++
 legacy/evas/src/modules/engines/buffer/evas_engine.c        | 2 +-
 .../evas/src/modules/engines/software_16_x11/evas_engine.c  | 2 +-
 legacy/evas/src/modules/engines/software_x11/evas_engine.c  | 2 +-
 .../modules/engines/xrender_x11/evas_engine_xlib_ximage.c   | 4 ++++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index a7262039c4..a9f400c7c4 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -184,6 +184,12 @@ evas_object_smart_member_add(Evas_Object *obj, Evas_Object *smart_obj)
 	abort();
 	return;
      }
+   if (!smart_obj->layer)
+     {
+	ERROR("No evas surface associated with smart object (%p)", smart_obj);
+	abort();
+	return;
+     }
    if (obj->layer && smart_obj->layer
        && obj->layer->evas != smart_obj->layer->evas)
      {
diff --git a/legacy/evas/src/modules/engines/buffer/evas_engine.c b/legacy/evas/src/modules/engines/buffer/evas_engine.c
index 866c231606..d9a5b0820b 100644
--- a/legacy/evas/src/modules/engines/buffer/evas_engine.c
+++ b/legacy/evas/src/modules/engines/buffer/evas_engine.c
@@ -75,7 +75,7 @@ _output_setup(int w,
 
      {
 	Outbuf_Depth dep;
-	DATA32 color_key;
+	DATA32 color_key = 0;
 
 	dep = OUTBUF_DEPTH_BGR_24BPP_888_888;
 	if      (depth_type == EVAS_ENGINE_BUFFER_DEPTH_ARGB32)
diff --git a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
index 6028b80e8a..76558f95e1 100644
--- a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
@@ -459,7 +459,7 @@ static void
 eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h)
 {
    Render_Engine *re;
-   XRectangle r;
+   XRectangle r = { 0, 0, 0, 0 };
 
    re = (Render_Engine *)data;
 
diff --git a/legacy/evas/src/modules/engines/software_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
index 2559d39337..2b42599a91 100644
--- a/legacy/evas/src/modules/engines/software_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
@@ -345,8 +345,8 @@ eng_info_free(Evas *e __UNUSED__, void *info)
 static int
 eng_setup(Evas *e, void *in)
 {
-   Render_Engine                 *re;
    Evas_Engine_Info_Software_X11 *info;
+   Render_Engine *re = NULL;
 
    info = (Evas_Engine_Info_Software_X11 *)in;
    if (!e->engine.data.output)
diff --git a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xlib_ximage.c b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xlib_ximage.c
index 92d4e74e9d..a17bab778c 100644
--- a/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xlib_ximage.c
+++ b/legacy/evas/src/modules/engines/xrender_x11/evas_engine_xlib_ximage.c
@@ -205,6 +205,10 @@ _xr_xlib_image_new(Ximage_Info *xinf, int w, int h, int depth)
 	     return NULL;
 	  }
      }
+   else
+     {
+	return NULL;
+     }
 
    xim_ok:
    _xr_xlib_image_info_pool_flush(xinf, 32, (1600 * 1200 * 32 * 2));