Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_cache.c edje_calc.c edje_embryo.c edje_private.h
edje_textblock_styles.c
Log Message:
- Formatting.
- Remove old code.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_cache.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_cache.c 4 Apr 2007 13:25:54 -0000 1.11
+++ edje_cache.c 5 Apr 2007 15:54:16 -0000 1.12
@@ -64,24 +64,28 @@
}
static int
-_edje_font_hash (Edje_File *edf)
+_edje_font_hash(Edje_File *edf)
{
int count = 0;
if (edf->font_dir)
{
Evas_List *l;
- for (l = edf->font_dir->entries; l; l = evas_list_next (l))
+ for (l = edf->font_dir->entries; l; l = evas_list_next(l))
{
- Edje_Font_Directory_Entry *fnt = l->data;
- int length = strlen (fnt->entry) + 7;
- char *tmp = alloca (length);
-
- snprintf (tmp, length, "fonts/%s", fnt->entry);
- fnt->path = evas_stringshare_add (tmp);
- evas_stringshare_del (fnt->entry);
+ Edje_Font_Directory_Entry *fnt;
+ int length;
+ char *tmp;
+
+ fnt = l->data;
+ length = strlen(fnt->entry) + 7;
+ tmp = alloca(length);
+
+ snprintf(tmp, length, "fonts/%s", fnt->entry);
+ fnt->path = evas_stringshare_add(tmp);
+ evas_stringshare_del(fnt->entry);
fnt->entry = fnt->path + 6;
- edf->font_hash = evas_hash_direct_add (edf->font_hash, fnt->entry,
fnt);
+ edf->font_hash = evas_hash_direct_add(edf->font_hash, fnt->entry,
fnt);
count++;
}
@@ -150,7 +154,7 @@
edf->font_hash = NULL;
- _edje_font_hash (edf);
+ _edje_font_hash(edf);
eet_close(ef);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- edje_calc.c 4 Apr 2007 13:25:54 -0000 1.96
+++ edje_calc.c 5 Apr 2007 15:54:16 -0000 1.97
@@ -682,9 +682,11 @@
if (!text) text = "";
/* check if the font is embedded in the .eet */
- if (ed->file->font_hash)
+ if (ed->file->font_hash)
{
- Edje_Font_Directory_Entry *fnt = evas_hash_find
(ed->file->font_hash, font);
+ Edje_Font_Directory_Entry *fnt;
+
+ fnt = evas_hash_find(ed->file->font_hash, font);
if (fnt)
{
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- edje_embryo.c 18 Jan 2007 23:58:40 -0000 1.54
+++ edje_embryo.c 5 Apr 2007 15:54:16 -0000 1.55
@@ -353,7 +353,7 @@
CHKPARAM(1);
- return (Embryo_Cell) _edje_var_list_count_get(ed, (int) params[1]);
+ return (Embryo_Cell)_edje_var_list_count_get(ed, (int) params[1]);
}
/* remove(id, n) */
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- edje_private.h 4 Apr 2007 13:25:54 -0000 1.120
+++ edje_private.h 5 Apr 2007 15:54:16 -0000 1.121
@@ -267,7 +267,7 @@
struct _Edje_Font_Directory_Entry
{
const char *entry; /* the name of the font */
- char *path;
+ const char *path;
};
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- edje_textblock_styles.c 4 Apr 2007 13:25:54 -0000 1.10
+++ edje_textblock_styles.c 5 Apr 2007 15:54:16 -0000 1.11
@@ -8,33 +8,9 @@
static int
_edje_font_is_embedded(Edje_File *edf, char *font)
{
- Edje_Font_Directory_Entry *fnt = NULL;
-
if (!edf->font_dir) return 0;
-/* fnt = evas_hash_find (edf->font_hash, font); */
-/* if (fnt) */
-/* if (fnt->entry && (!strcmp(fnt->entry, font))) */
-/* return 1; */
- return 1;
+ return 1;
}
-
-#if 0
-static char *
-_edje_str_deescape(char *str)
-{
- char *s2, *s, *d;
-
- s2 = malloc(strlen(str) + 1);
- if (!s2) return NULL;
- for (s = str, d = s2; *s != 0; s++, d++)
- {
- if ((*s == '\\') && (s[1] != 0)) s++;
- *d = *s;
- }
- *d = 0;
- return s2;
-}
-#endif
/* Put a \ before and Space( ), \ or ' in a string.
* A newly allocated string is returned.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
