[EGIT] [core/efl] master 06/08: fix clang sizeof complaint

[Rasterman]

raster pushed a commit to branch master.

commit b84e81fbeadf703aaf9fbab383b76c1c2aad1103
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Tue Jul 16 20:30:21 2013 +0900

    fix clang sizeof complaint
---
 src/bin/edje/edje_cc_handlers.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index e9275cc..efcf71c 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -1367,17 +1367,16 @@ st_externals_external(void)
         Edje_External_Directory_Entry *entries;
         
        edje_file->external_dir->entries_count++;
-          
         entries = realloc(edje_file->external_dir->entries,
                           sizeof (Edje_External_Directory_Entry) * 
edje_file->external_dir->entries_count);
         if (!entries)
           {
-             ERR("Out of memory at realloc()");
+            ERR("not enough memory");
              exit(-1);
           }
        edje_file->external_dir->entries = entries;
        memset(edje_file->external_dir->entries + 
edje_file->external_dir->entries_count - 1,
-              0, sizeof (Edje_Image_Directory_Entry));
+              0, sizeof (Edje_External_Directory_Entry));
        if (!edje_file->external_dir->entries)
          {
             ERR("not enough memory");
@@ -1468,8 +1467,15 @@ st_images_image(void)
        }
 
    edje_file->image_dir->entries_count++;
-   edje_file->image_dir->entries = realloc(edje_file->image_dir->entries,
-                                          sizeof (Edje_Image_Directory_Entry) 
* edje_file->image_dir->entries_count);
+   img = realloc(edje_file->image_dir->entries,
+                 sizeof (Edje_Image_Directory_Entry) * 
edje_file->image_dir->entries_count);
+   if (!img)
+     {
+        ERR("No enough memory.");
+        exit(-1);
+     }
+   edje_file->image_dir->entries = img;
+   
    memset(edje_file->image_dir->entries + edje_file->image_dir->entries_count 
- 1,
          0, sizeof (Edje_Image_Directory_Entry));
    if (!edje_file->image_dir->entries)

-- 

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk