Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_data.c
Log Message:
ok- tying to remove redundant nul/0 items seems to have broken something -
put them back.
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- eet_data.c 8 Sep 2007 15:32:33 -0000 1.50
+++ eet_data.c 9 Sep 2007 01:46:47 -0000 1.51
@@ -212,7 +212,6 @@
if (((char *)src + sizeof(char)) > (char *)src_end) return -1;
s = (char *)src;
d = (char *)dst;
- if (*s == 0) return NULL;
*d = *s;
CONV8(*d);
return sizeof(char);
@@ -226,7 +225,7 @@
d = (char *)malloc(sizeof(char));
if (!d) return NULL;
s = (char *)src;
- if (*s == 0) return NULL;
+// if (*s == 0) return NULL;
*d = *s;
CONV8(*d);
*size_ret = sizeof(char);
@@ -254,7 +253,7 @@
d = (short *)malloc(sizeof(short));
if (!d) return NULL;
s = (short *)src;
- if (*s == 0) return NULL;
+// if (*s == 0) return NULL;
*d = *s;
CONV16(*d);
*size_ret = sizeof(short);
@@ -282,7 +281,7 @@
d = (int *)malloc(sizeof(int));
if (!d) return NULL;
s = (int *)src;
- if (*s == 0) return NULL;
+// if (*s == 0) return NULL;
*d = *s;
CONV32(*d);
*size_ret = sizeof(int);
@@ -310,7 +309,7 @@
d = (unsigned long long *)malloc(sizeof(unsigned long long));
if (!d) return NULL;
s = (unsigned long long *)src;
- if (*s == 0) return NULL;
+// if (*s == 0) return NULL;
*d = *s;
CONV64(*d);
*size_ret = sizeof(unsigned long long);
@@ -395,7 +394,7 @@
int len;
s = (float *)src;
- if (*s == 0.0) return NULL;
+// if (*s == 0.0) return NULL;
prev_locale = setlocale(LC_NUMERIC, "C");
snprintf(buf, sizeof(buf), "%a", (double)(*s));
if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
@@ -443,7 +442,7 @@
int len;
s = (double *)src;
- if (*s == 0.0) return NULL;
+// if (*s == 0.0) return NULL;
prev_locale = setlocale(LC_NUMERIC, "C");
snprintf(buf, sizeof(buf), "%a", (double)(*s));
if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
@@ -1836,6 +1835,8 @@
{
int group_type = EET_G_UNKNOWN, type = EET_T_UNKNOW;
+ group_type = ede->group_type;
+ type = ede->type;
if ((echnk.type == 0) && (echnk.group_type == 0))
{
type = ede->type;
@@ -2026,7 +2027,7 @@
if ((echnk.type > EET_T_UNKNOW) &&
(echnk.type < EET_T_LAST))
- type = echnk.type;
+ type = echnk.type;
else if ((echnk.group_type > EET_G_UNKNOWN) &&
(echnk.group_type < EET_G_LAST))
group_type = echnk.group_type;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
