Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/dox
Modified Files:
dox.c dox.h file.c format.c text.c
Log Message:
Assume free(0) is ok (if not HAVE_FREE_NULL_BUG will have to be defined).
===================================================================
RCS file: /cvs/e/e16/e/dox/dox.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- dox.c 3 Feb 2008 16:47:22 -0000 1.44
+++ dox.c 23 Feb 2008 12:09:35 -0000 1.45
@@ -243,8 +243,8 @@
{ \
l = ll; \
ll = ll->next; \
- free(l->name); \
- free(l); \
+ Efree(l->name); \
+ Efree(l); \
}
#define UPDATE_NOW \
@@ -572,7 +572,7 @@
dirlen = sp - exe;
if (dirlen > 1)
{
- free(docdir);
+ Efree(docdir);
docdir = EMALLOC(char, dirlen + 1);
memcpy(docdir, exe, dirlen);
@@ -580,8 +580,7 @@
}
GetObjects(p);
pclose(p);
- if (page_hist)
- free(page_hist);
+ Efree(page_hist);
page_hist = EMALLOC(int, 1);
page_hist[0] = 0;
===================================================================
RCS file: /cvs/e/e16/e/dox/dox.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- dox.h 22 Dec 2007 11:46:39 -0000 1.44
+++ dox.h 23 Feb 2008 12:09:35 -0000 1.45
@@ -146,9 +146,13 @@
extern Root VRoot;
extern char *docdir;
-#define Efree free
#define Emalloc malloc
#define Erealloc realloc
+#if HAVE_FREE_NULL_BUG
+#define Efree(p) if (p) free(p)
+#else
+#define Efree free
+#endif
#define EMALLOC(type, num) (type*)Emalloc((num)*sizeof(type))
#define EREALLOC(type, ptr, num) (type*)Erealloc(ptr, (num)*sizeof(type))
===================================================================
RCS file: /cvs/e/e16/e/dox/file.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- file.c 13 Jan 2007 19:14:25 -0000 1.19
+++ file.c 23 Feb 2008 12:09:35 -0000 1.20
@@ -44,10 +44,8 @@
if (!l)
return;
while (num--)
- if (l[num])
- free(l[num]);
- free(l);
- return;
+ Efree(l[num]);
+ Efree(l);
}
void
@@ -110,7 +108,6 @@
}
*wd = 0;
}
- return;
}
#ifdef USE_WORD_MB
@@ -265,7 +262,6 @@
}
*wd = 0;
}
- return;
}
#endif
@@ -294,14 +290,14 @@
sprintf(fname, "%s.%s", tmp, lang);
if (exists(fname))
{
- free(tmp);
- free(lang);
+ Efree(tmp);
+ Efree(lang);
return 1;
}
}
strcpy(fname, tmp);
- free(tmp);
- free(lang);
+ Efree(tmp);
+ Efree(lang);
return 0;
}
===================================================================
RCS file: /cvs/e/e16/e/dox/format.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- format.c 22 Dec 2007 11:46:39 -0000 1.24
+++ format.c 23 Feb 2008 12:09:35 -0000 1.25
@@ -423,29 +423,22 @@
{
int j;
- if (page[i].name)
- free(page[i].name);
- if (page[i].background)
- free(page[i].background);
+ Efree(page[i].name);
+ Efree(page[i].background);
for (j = 0; j < page[i].count; j++)
{
switch (page[i].obj[j].type)
{
case IMG:
- if (((Img_ *) page[i].obj[j].object)->src)
- free(((Img_ *) page[i].obj[j].object)->src);
- if (((Img_ *) page[i].obj[j].object)->src2)
- free(((Img_ *) page[i].obj[j].object)->src2);
- if (((Img_ *) page[i].obj[j].object)->src3)
- free(((Img_ *) page[i].obj[j].object)->src3);
- if (((Img_ *) page[i].obj[j].object)->link)
- free(((Img_ *) page[i].obj[j].object)->link);
+ Efree(((Img_ *) page[i].obj[j].object)->src);
+ Efree(((Img_ *) page[i].obj[j].object)->src2);
+ Efree(((Img_ *) page[i].obj[j].object)->src3);
+ Efree(((Img_ *) page[i].obj[j].object)->link);
break;
case BR:
break;
case FONT:
- if (((Font_ *) page[i].obj[j].object)->face)
- free(((Font_ *) page[i].obj[j].object)->face);
+ Efree(((Font_ *) page[i].obj[j].object)->face);
break;
case P:
break;
@@ -454,13 +447,11 @@
case PAGE:
break;
}
- if (page[i].obj[j].object)
- free(page[i].obj[j].object);
+ Efree(page[i].obj[j].object);
}
- if (page[i].obj)
- free(page[i].obj);
+ Efree(page[i].obj);
}
- free(page);
+ Efree(page);
num_pages = 0;
page = NULL;
have_font = 0;
@@ -482,8 +473,7 @@
{
if (!GetNextTag(&obj))
{
- if (fdat)
- free(fdat);
+ Efree(fdat);
return 0;
}
}
@@ -492,8 +482,7 @@
{
if (!GetNextTag(&obj))
{
- if (fdat)
- free(fdat);
+ Efree(fdat);
return 0;
}
}
@@ -513,7 +502,7 @@
have_font = 1;
obj.object = NULL;
}
- free(fdat);
+ Efree(fdat);
}
int
===================================================================
RCS file: /cvs/e/e16/e/dox/text.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- text.c 22 Dec 2007 11:49:56 -0000 1.26
+++ text.c 23 Feb 2008 12:09:35 -0000 1.27
@@ -91,8 +91,7 @@
ts->height = as + ds;
}
}
- if (s2)
- free(s2);
+ Efree(s2);
if (ts->efont)
return;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
