From: tiago <tiago@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Mon, 5 Apr 2010 14:05:21 +0000 (+0000)
Subject: _edje_file_hash can't be NULL in open_new
X-Git-Tag: 2.0_alpha~163^2~578
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14da7988a379af71e5c830f67ffdc9cee283e664;p=framework%2Fuifw%2Fedje.git

_edje_file_hash can't be NULL in open_new

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@47763 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/edje_cache.c b/src/lib/edje_cache.c
index f5384da..3a7039f 100644
--- a/src/lib/edje_cache.c
+++ b/src/lib/edje_cache.c
@@ -248,7 +248,7 @@ _edje_file_dangling(Edje_File *edf)
 Edje_File *
 _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret)
 {
-   Edje_File *edf;
+   Edje_File *edf = NULL;
    Eina_List *l, *hist;
    Edje_Part_Collection *edc;
    Edje_Part *ep;
@@ -260,9 +260,12 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
      }
 
    if (!_edje_file_hash)
-     _edje_file_hash = eina_hash_string_small_new(NULL);
-   edf = eina_hash_find(_edje_file_hash, file);
+     {
+	_edje_file_hash = eina_hash_string_small_new(NULL);
+	goto open_new;
+     }
 
+   edf = eina_hash_find(_edje_file_hash, file);
    if (edf)
      {
 	if (edf->mtime != st.st_mtime)
@@ -273,39 +276,42 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
 	  }
 
 	edf->references++;
+	goto open;
      }
-   else
+
+   EINA_LIST_FOREACH(_edje_file_cache, l, edf)
      {
-        EINA_LIST_FOREACH(_edje_file_cache, l, edf)
+	if (!strcmp(edf->path, file))
 	  {
-	     if (!strcmp(edf->path, file))
+	     if (edf->mtime != st.st_mtime)
 	       {
-		  if (edf->mtime != st.st_mtime)
-		    {
-		       _edje_file_cache = eina_list_remove_list(_edje_file_cache, l);
-		       _edje_file_free(edf);
-		       edf = NULL;
-		       goto open_new;
-		    }
-
-		  edf->references = 1;
 		  _edje_file_cache = eina_list_remove_list(_edje_file_cache, l);
-		  eina_hash_add(_edje_file_hash, file, edf);
-		  break;
+		  _edje_file_free(edf);
+		  edf = NULL;
+		  goto open_new;
 	       }
-	     edf = NULL;
+
+	     edf->references = 1;
+	     _edje_file_cache = eina_list_remove_list(_edje_file_cache, l);
+	     eina_hash_add(_edje_file_hash, file, edf);
+	     break;
 	  }
+	edf = NULL;
      }
 
  open_new:
    if (!edf)
      {
+	if (!_edje_file_hash)
+	  _edje_file_hash = eina_hash_string_small_new(NULL);
 	edf = _edje_file_open(file, coll, error_ret, edc_ret);
 	if (!edf) return NULL;
 	eina_hash_add(_edje_file_hash, file, edf);
 	return edf;
      }
 
+ open:
+
    if (!coll) return edf;
 
    if (!edf->collection_hash)