summaryrefslogtreecommitdiff
path: root/src/lib/evas/cserve2
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-03-04 14:46:13 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-03-04 14:59:27 +0900
commit752fde1025e9ff27af465800b250b15626c38e6c (patch)
tree4bf0267a84dc5240f78aba3c819b80523d7a325b /src/lib/evas/cserve2
parent63a18f3fcee6a631c16f582d7c828ab5d96547d0 (diff)
Evas cserve2: Fix excessive warnings during shutdown
The global index for fonts will be freed after cserve2 shutdown but Evas keeps trying to free all its fonts after that.
Diffstat (limited to 'src/lib/evas/cserve2')
-rw-r--r--src/lib/evas/cserve2/evas_cs2_client.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index 3591d22914..2476e915ad 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -321,8 +321,6 @@ _shared_index_close(Shared_Index *si)
321 } 321 }
322 if (si->entries_by_hkey) 322 if (si->entries_by_hkey)
323 eina_hash_free(si->entries_by_hkey); 323 eina_hash_free(si->entries_by_hkey);
324 si->f = NULL;
325 si->data = NULL;
326 memset(si, 0, sizeof(Shared_Index)); 324 memset(si, 0, sizeof(Shared_Index));
327} 325}
328 326
@@ -1589,7 +1587,9 @@ _font_entry_free(Font_Entry *fe)
1589 if (fe->fash[i]) 1587 if (fe->fash[i])
1590 fash_gl_free(fe->fash[i]); 1588 fash_gl_free(fe->fash[i]);
1591 1589
1592 eina_hash_del_by_key(_index.fonts.entries_by_hkey, fe->hkey); 1590 if (_index.fonts.entries_by_hkey)
1591 eina_hash_del_by_key(_index.fonts.entries_by_hkey, fe->hkey);
1592
1593 free(fe->hkey); 1593 free(fe->hkey);
1594 eina_stringshare_del(fe->source); 1594 eina_stringshare_del(fe->source);
1595 eina_stringshare_del(fe->name); 1595 eina_stringshare_del(fe->name);
@@ -2894,16 +2894,7 @@ _shared_index_remap_check(Shared_Index *si, int elemsize)
2894 2894
2895 if (!si->path[0]) 2895 if (!si->path[0])
2896 { 2896 {
2897 if (si->f) 2897 _shared_index_close(si);
2898 {
2899 DBG("Closing index map");
2900 eina_file_map_free(si->f, si->data);
2901 eina_file_close(si->f);
2902 eina_hash_free(si->entries_by_hkey);
2903 si->f = NULL;
2904 si->data = NULL;
2905 memset(si, 0, sizeof(*si));
2906 }
2907 return EINA_FALSE; 2898 return EINA_FALSE;
2908 } 2899 }
2909 2900