Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet_private.h eet_data.c eet_lib.c
Log Message:
alignment niceness for ARM :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Eet_private.h 10 Jul 2003 10:32:27 -0000 1.2
+++ Eet_private.h 10 Jul 2003 23:18:42 -0000 1.3
@@ -26,7 +26,7 @@
void _eet_memfile_write_close(FILE *f);
#ifndef PATH_MAX
-#define PATH_MAX 4096
+#define PATH_MAX 4095
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eet_data.c 7 Jul 2003 22:36:37 -0000 1.11
+++ eet_data.c 10 Jul 2003 23:18:42 -0000 1.12
@@ -863,19 +863,11 @@
static int
eet_data_get_short(void *src, void *src_end, void *dst)
{
- short *s, *d;
- short tmp;
+ short *d;
if ((src + sizeof(short)) > src_end) return -1;
- s = (short *)src;
+ memcpy(dst, src, sizeof(short));
d = (short *)dst;
- /* alignment fixup */
- if ((int)s & (sizeof(short) - 1))
- {
- memcpy(&tmp, s, sizeof(short));
- s = &tmp;
- }
- *d = *s;
CONV16(*d);
return sizeof(short);
}
@@ -898,19 +890,11 @@
static int
eet_data_get_int(void *src, void *src_end, void *dst)
{
- int *s, *d;
- int tmp;
+ int *d;
if ((src + sizeof(int)) > src_end) return -1;
- s = (int *)src;
+ memcpy(dst, src, sizeof(int));
d = (int *)dst;
- /* alignment fixup */
- if ((int)s & (sizeof(int) - 1))
- {
- memcpy(&tmp, s, sizeof(int));
- s = &tmp;
- }
- *d = *s;
CONV32(*d);
return sizeof(int);
}
@@ -933,19 +917,11 @@
static int
eet_data_get_long_long(void *src, void *src_end, void *dst)
{
- long long *s, *d;
- long long tmp;
+ long long *d;
if ((src + sizeof(long long)) > src_end) return -1;
- s = (long long *)src;
+ memcpy(dst, src, sizeof(long long));
d = (long long *)dst;
- /* alignment fixup */
- if ((int)s & (sizeof(long long) - 1))
- {
- memcpy(&tmp, s, sizeof(long long));
- s = &tmp;
- }
- *d = *s;
CONV64(*d);
return sizeof(long long);
}
@@ -1696,7 +1672,7 @@
{
int ret;
void *data_ret;
-
+
if ((ede->type >= EET_T_CHAR) &&
(ede->type <= EET_T_STRING))
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- eet_lib.c 16 Jun 2003 13:39:42 -0000 1.7
+++ eet_lib.c 10 Jul 2003 23:18:42 -0000 1.8
@@ -372,7 +372,7 @@
return NULL;
}
/* get magic no */
- i1 = *((int *)(buf + 0));
+ memcpy(&i1, buf + 0, sizeof(int));
i2 = ntohl(i1);
if (i2 != EET_MAGIC_FILE)
{
@@ -380,10 +380,10 @@
return NULL;
}
/* get entries count and byte count */
- i1 = *((int *)(buf + 4));
+ memcpy(&i1, buf + 4, sizeof(int));
i2 = ntohl(i1);
num_entries = (int)i2;
- i1 = *((int *)(buf + 8));
+ memcpy(&i1, buf + 8, sizeof(int));
i2 = ntohl(i1);
byte_entries = (int)i2;
/* we cant have <= 0 values here - invalid */
@@ -463,19 +463,19 @@
return NULL;
}
/* get entrie header */
- i1 = *((int *)(p + 0));
+ memcpy(&i1, p + 0, sizeof(int));
i2 = ntohl(i1);
offset = (int)i2;
- i1 = *((int *)(p + 4));
+ memcpy(&i1, p + 4, sizeof(int));
i2 = ntohl(i1);
flags = (int)i2;
- i1 = *((int *)(p + 8));
+ memcpy(&i1, p + 8, sizeof(int));
i2 = ntohl(i1);
size = (int)i2;
- i1 = *((int *)(p + 12));
+ memcpy(&i1, p + 12, sizeof(int));
i2 = ntohl(i1);
data_size = (int)i2;
- i1 = *((int *)(p + 16));
+ memcpy(&i1, p + 16, sizeof(int));
i2 = ntohl(i1);
name_size = (int)i2;
/* invalid size */
@@ -510,7 +510,6 @@
/* copy name in and terminate it */
strncpy(name, p + 20, name_size);
name[name_size] = 0;
-
/* get hask bucket it should go in */
hash = eet_hash_gen(name, ef->header->directory->size);
/* resize hask bucket */
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs