From cfd867dff428c1d7b8176eb67391ce8ab39f35ed Mon Sep 17 00:00:00 2001
From: Daniel Zaoui <daniel.zaoui@samsung.com>
Date: Wed, 5 Dec 2012 12:41:49 +0000
Subject: [PATCH] Fix for some KlocWork and parasoft issues

Signed-off-by: Daniel Zaoui <daniel.zaoui@samsung.com>

SVN revision: 80238
---
 src/bin/clouseau.c                    | 6 +++---
 src/lib/Clouseau.h                    | 2 +-
 src/lib/clouseau_data.c               | 7 +++++--
 src/lib/clouseau_object_information.c | 2 ++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/bin/clouseau.c b/src/bin/clouseau.c
index 9b35f13..44c6812 100644
--- a/src/bin/clouseau.c
+++ b/src/bin/clouseau.c
@@ -1344,11 +1344,11 @@ _bt_clicked(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 static void
 _bt_load_file(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
-   gui_elements *g = data;
-   app_info_st *app = calloc(1, sizeof(*app));
-   tree_data_st *td =  calloc(1, sizeof(*td));
    if (event_info)
      {
+        gui_elements *g = data;
+        app_info_st *app = calloc(1, sizeof(*app));
+        tree_data_st *td =  calloc(1, sizeof(*td));
         Eina_Bool s = clouseau_data_eet_info_read(event_info,
               (app_info_st **) &app, (tree_data_st **) &td);
 
diff --git a/src/lib/Clouseau.h b/src/lib/Clouseau.h
index 04d474f..ba0672d 100644
--- a/src/lib/Clouseau.h
+++ b/src/lib/Clouseau.h
@@ -77,9 +77,9 @@ struct _Clouseau_Evas_Props
 struct _Clouseau_Evas_Text_Props
 {
    const char *font;
-   int size;
    const char *source;
    const char *text;
+   int size;
 };
 
 struct _Clouseau_Evas_Image_Props
diff --git a/src/lib/clouseau_data.c b/src/lib/clouseau_data.c
index 9612449..8ee34a3 100644
--- a/src/lib/clouseau_data.c
+++ b/src/lib/clouseau_data.c
@@ -634,12 +634,15 @@ EAPI void *
 clouseau_data_packet_info_get(const char *p_type, void *data, size_t size)
 {
    bmp_info_st *st = NULL;
-   void *host_blob = _net_to_host_blob_get(data, size);
-   char *ptr = host_blob;
+   void *host_blob = NULL;
+   char *ptr = NULL;
 
    if (size <= 0)
       return NULL;
 
+   host_blob = _net_to_host_blob_get(data, size);
+   ptr = host_blob;
+
    if (!strcmp(p_type, CLOUSEAU_BMP_DATA_STR))
      {
         uint32_t *e_size32 = (uint32_t *) ptr;
diff --git a/src/lib/clouseau_object_information.c b/src/lib/clouseau_object_information.c
index a34fe74..98fb6ab 100644
--- a/src/lib/clouseau_object_information.c
+++ b/src/lib/clouseau_object_information.c
@@ -159,6 +159,8 @@ clouseau_object_information_free(Clouseau_Object *oinfo)
       case CLOUSEAU_OBJ_TYPE_UNKNOWN:
       case CLOUSEAU_OBJ_TYPE_OTHER:
          break;
+      default:
+         break;
      }
 
    free(oinfo);