Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h eet_data.c eet_image.c eet_lib.c eet_memfile.c
Log Message:
* EAPI_DEF is actually useless. go back to EAPI
before using the correct way to deal with
dllimport / dllexport on Windows
* remove some trailing spaces
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- Eet.h 6 Mar 2008 17:52:59 -0000 1.47
+++ Eet.h 7 Mar 2008 09:59:37 -0000 1.48
@@ -12,7 +12,6 @@
# else
# define EAPI __declspec(dllimport)
# endif
-# define EAPI_DEF
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -23,7 +22,6 @@
# else
# define EAPI
# endif
-# define EAPI_DEF EAPI
#endif
#ifdef __cplusplus
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- eet_data.c 6 Mar 2008 17:52:59 -0000 1.65
+++ eet_data.c 7 Mar 2008 09:59:37 -0000 1.66
@@ -596,7 +596,7 @@
*
* char[4] = "CHnK"; // untyped data ... or
* char[4] = "CHKx"; // typed data - x == type
- *
+ *
* int = chunk size (including magic string);
* char[] = chuck magic/name string (0 byte terminated);
* ... sub-chunks (a chunk can contain chuncks recusrively) ...
@@ -789,14 +789,14 @@
_eet_descriptor_hash_new(Eet_Data_Descriptor *edd)
{
int i;
-
+
edd->elements.hash.size = 1 << 6;
edd->elements.hash.buckets = calloc(1, sizeof(Eet_Data_Descriptor_Hash) *
edd->elements.hash.size);
for (i = 0; i < edd->elements.num; i++)
{
Eet_Data_Element *ede;
int hash;
-
+
ede = &(edd->elements.set[i]);
hash = _eet_hash_gen((char *) ede->name, 6);
if (!edd->elements.hash.buckets[hash].element)
@@ -804,7 +804,7 @@
else
{
Eet_Data_Descriptor_Hash *bucket;
-
+
bucket = calloc(1, sizeof(Eet_Data_Descriptor_Hash));
bucket->element = ede;
bucket->next = edd->elements.hash.buckets[hash].next;
@@ -817,11 +817,11 @@
_eet_descriptor_hash_free(Eet_Data_Descriptor *edd)
{
int i;
-
+
for (i = 0; i < edd->elements.hash.size; i++)
{
Eet_Data_Descriptor_Hash *bucket, *pbucket;
-
+
bucket = edd->elements.hash.buckets[i].next;
while (bucket)
{
@@ -838,7 +838,7 @@
{
int hash;
Eet_Data_Descriptor_Hash *bucket;
-
+
hash = _eet_hash_gen(name, 6);
if (!edd->elements.hash.buckets[hash].element) return NULL;
if (!strcmp(edd->elements.hash.buckets[hash].element->name, name))
@@ -878,7 +878,7 @@
/*---*/
-EAPI_DEF Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor_new(const char *name,
int size,
void *(*func_list_next) (void *l),
@@ -914,7 +914,7 @@
}
/* new replcement */
-EAPI_DEF Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
{
Eet_Data_Descriptor *edd;
@@ -949,7 +949,7 @@
return edd;
}
-EAPI_DEF Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc)
{
Eet_Data_Descriptor *edd;
@@ -988,7 +988,7 @@
return edd;
}
-EAPI_DEF void
+EAPI void
eet_data_descriptor_free(Eet_Data_Descriptor *edd)
{
_eet_descriptor_hash_free(edd);
@@ -996,8 +996,8 @@
free(edd);
}
-EAPI_DEF void
-eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
+EAPI void
+eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
const char *name, int type,
int group_type,
int offset,
@@ -1023,7 +1023,7 @@
ede->subtype = subtype;
}
-EAPI_DEF void *
+EAPI void *
eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
{
const Eet_Dictionary *ed = NULL;
@@ -1049,7 +1049,7 @@
return data_dec;
}
-EAPI_DEF int
+EAPI int
eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const
void *data, int compress)
{
Eet_Dictionary *ed;
@@ -1267,8 +1267,8 @@
for (strp = str; *strp; strp++)
{
- if (*strp == '\"') sz += 2;
- else if (*strp == '\\') sz += 2;
+ if (*strp == '\"') sz += 2;
+ else if (*strp == '\\') sz += 2;
else sz += 1;
}
s = malloc(sz + 1);
@@ -1295,7 +1295,7 @@
_eet_data_dump_string_escape(void *dumpdata, void dumpfunc(void *data, const
char *str), const char *str)
{
char *s;
-
+
s = _eet_data_string_escape(str);
if (s)
{
@@ -1312,7 +1312,7 @@
int in_token = 0;
int in_quote = 0;
int tlen = 0, tsize = 0;
-
+
#define TOK_ADD(x) \
{ \
tlen++; \
@@ -1323,7 +1323,7 @@
} \
tok[tlen - 1] = x; \
}
-
+
for (p = src; *len > 0; p++, (*len)--)
{
if (in_token)
@@ -1457,11 +1457,11 @@
void *cdata, *data;
int csize, size;
Node *n;
-
+
if (words_bigendian == -1)
{
unsigned long int v;
-
+
v = htonl(0x12345678);
if (v == 0x12345678) words_bigendian = 1;
else words_bigendian = 0;
@@ -1469,7 +1469,7 @@
ds = eet_data_stream_new();
if (!ds) return NULL;
-
+
switch (node->type)
{
case EET_G_UNKNOWN:
@@ -1633,7 +1633,7 @@
default:
break;
}
-
+
if ((node->type > EET_G_UNKNOWN) && (node->type < EET_G_LAST))
chnk = eet_data_chunk_new(ds->data, ds->pos, node->name, EET_T_UNKNOW,
node->type);
else
@@ -1641,20 +1641,20 @@
ds->data = NULL;
ds->size = 0;
eet_data_stream_free(ds);
-
+
ds = eet_data_stream_new();
eet_data_chunk_put(ed, chnk, ds);
cdata = ds->data;
csize = ds->pos;
-
+
ds->data = NULL;
ds->size = 0;
eet_data_stream_free(ds);
*size_ret = csize;
-
+
free(chnk->data);
eet_data_chunk_free(chnk);
-
+
return cdata;
}
@@ -1681,7 +1681,7 @@
for (p = src; p < (src + size);)
{
char *tok1, *tok2, *tok3, *tok4;
-
+
TOK_GET(tok1);
if (tok1)
{
@@ -1944,7 +1944,7 @@
if (chnk.type == EET_T_UNKNOW)
{
buf = tbuf;
-
+
for (i = 0; i < level; i++) dumpfunc(dumpdata, " ");
dumpfunc(dumpdata, "group \"");
_eet_data_dump_string_escape(dumpdata, dumpfunc, chnk.name);
@@ -2007,7 +2007,7 @@
{
int ret;
void *data_ret;
-
+
if (IS_SIMPLE_TYPE(type))
{
ret = eet_data_get_type(ed,
@@ -2018,7 +2018,7 @@
if (type == EET_T_STRING)
{
char **str;
-
+
str = (char **)(((char *)data) + ede->offset);
if (*str)
{
@@ -2039,7 +2039,7 @@
if (type == EET_T_INLINED_STRING)
{
char **str;
-
+
str = (char **)(((char *)data) +
ede->offset);
if (*str)
{
@@ -2051,7 +2051,7 @@
else if (ede->subtype)
{
void **ptr;
-
+
data_ret = _eet_data_descriptor_decode(ed,
ede->subtype,
echnk.data,
@@ -2080,7 +2080,7 @@
void *list = NULL;
void **ptr;
void *data_ret;
-
+
ptr = (void **)(((char *)data) + ede->offset);
list = *ptr;
data_ret = NULL;
@@ -2125,10 +2125,10 @@
void **ptr;
char *key = NULL;
void *data_ret = NULL;
-
+
ptr = (void **)(((char *)data) + ede->offset);
hash = *ptr;
-
+
/* Read key */
ret = eet_data_get_type(ed,
EET_T_STRING,
@@ -2136,11 +2136,11 @@
((char *)echnk.data) +
echnk.size,
&key);
if (ret <= 0) goto error;
-
+
/* Advance to next chunk */
NEXT_CHUNK(p, size, echnk, ed);
memset(&echnk, 0, sizeof(Eet_Data_Chunk));
-
+
/* Read value */
eet_data_chunk_get(ed, &echnk, p, size);
if (!echnk.name) goto error;
@@ -2193,7 +2193,7 @@
{
unsigned char dd[128];
int group_type = EET_G_UNKNOWN, type = EET_T_UNKNOW;
-
+
if ((echnk.type > EET_T_UNKNOW) &&
(echnk.type < EET_T_LAST))
type = echnk.type;
@@ -2204,7 +2204,7 @@
{
int ret;
void *data_ret;
-
+
if (IS_SIMPLE_TYPE(type))
{
ret = eet_data_get_type(ed,
@@ -2262,7 +2262,7 @@
case EET_T_STRING:
{
char *s;
-
+
s = *((char **)dd);
if (s)
{
@@ -2325,7 +2325,7 @@
{
int ret;
void *data_ret;
-
+
data_ret = NULL;
if (IS_SIMPLE_TYPE(type))
{
@@ -2354,7 +2354,7 @@
int ret;
char *key = NULL;
void *data_ret = NULL;
-
+
/* Read key */
ret = eet_data_get_type(ed,
EET_T_STRING,
@@ -2362,11 +2362,11 @@
((char *)echnk.data) +
echnk.size,
&key);
if (ret <= 0) goto error;
-
+
/* Advance to next chunk */
NEXT_CHUNK(p, size, echnk, ed);
memset(&echnk, 0, sizeof(Eet_Data_Chunk));
-
+
/* Read value */
eet_data_chunk_get(ed, &echnk, p, size);
if (!echnk.name) goto error;
@@ -2383,7 +2383,7 @@
else
{
char *s;
-
+
s = key;
if (s)
{
@@ -2419,7 +2419,7 @@
/* advance to next chunk */
NEXT_CHUNK(p, size, echnk, ed);
}
-
+
_eet_freelist_unref();
_eet_freelist_str_unref();
_eet_freelist_list_unref();
@@ -2472,7 +2472,7 @@
return NULL;
}
-EAPI_DEF int
+EAPI int
eet_data_text_dump(const void *data_in,
int size_in,
void (*dumpfunc) (void *data, const char *str),
@@ -2484,7 +2484,7 @@
return 0;
}
-EAPI_DEF void *
+EAPI void *
eet_data_text_undump(const char *text,
int textlen,
int *size_ret)
@@ -2492,7 +2492,7 @@
return _eet_data_dump_parse(NULL, size_ret, text, textlen);
}
-EAPI_DEF void *
+EAPI void *
eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
const void *data_in,
int size_in)
@@ -2632,7 +2632,7 @@
return cdata;
}
-EAPI_DEF void *
+EAPI void *
eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
const void *data_in,
int *size_ret)
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- eet_image.c 2 Mar 2008 06:49:48 -0000 1.16
+++ eet_image.c 7 Mar 2008 09:59:37 -0000 1.17
@@ -703,7 +703,7 @@
return d;
}
-EAPI_DEF int
+EAPI int
eet_data_image_write(Eet_File *ef, const char *name,
const void *data, unsigned int w, unsigned int h, int
alpha,
int compress, int quality, int lossy)
@@ -723,7 +723,7 @@
return 0;
}
-EAPI_DEF void *
+EAPI void *
eet_data_image_read(Eet_File *ef, const char *name,
unsigned int *w, unsigned int *h, int *alpha,
int *compress, int *quality, int *lossy)
@@ -750,7 +750,7 @@
return d;
}
-EAPI_DEF int
+EAPI int
eet_data_image_header_read(Eet_File *ef, const char *name,
unsigned int *w, unsigned int *h, int *alpha,
int *compress, int *quality, int *lossy)
@@ -775,7 +775,7 @@
return d;
}
-EAPI_DEF void *
+EAPI void *
eet_data_image_encode(const void *data, int *size_ret, unsigned int w,
unsigned int h, int alpha, int compress, int quality, int lossy)
{
void *d = NULL;
@@ -799,7 +799,7 @@
return d;
}
-EAPI_DEF int
+EAPI int
eet_data_image_header_decode(const void *data, int size, unsigned int *w,
unsigned int *h, int *alpha, int *compress, int *quality, int *lossy)
{
int header[8];
@@ -883,7 +883,7 @@
return 0;
}
-EAPI_DEF void *
+EAPI void *
eet_data_image_decode(const void *data, int size, unsigned int *w, unsigned
int *h, int *alpha, int *compress, int *quality, int *lossy)
{
unsigned int *d = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- eet_lib.c 6 Mar 2008 17:52:59 -0000 1.92
+++ eet_lib.c 7 Mar 2008 09:59:37 -0000 1.93
@@ -599,13 +599,13 @@
return EET_ERROR_WRITE_ERROR;
}
-EAPI_DEF int
+EAPI int
eet_init(void)
{
return ++eet_initcount;
}
-EAPI_DEF int
+EAPI int
eet_shutdown(void)
{
if (--eet_initcount == 0)
@@ -617,7 +617,7 @@
return eet_initcount;
}
-EAPI_DEF void
+EAPI void
eet_clearcache(void)
{
int num = 0;
@@ -816,7 +816,7 @@
ef->ed->count = num_dictionary_entries;
ef->ed->start = start + bytes_dictionary_entries +
bytes_directory_entries;
ef->ed->end = ef->ed->start;
-
+
for (j = 0; j < ef->ed->count; ++j)
{
int hash;
@@ -1043,7 +1043,7 @@
return NULL;
}
-EAPI_DEF Eet_File *
+EAPI Eet_File *
eet_memopen_read(const void *data, size_t size)
{
Eet_File *ef;
@@ -1070,7 +1070,7 @@
return eet_internal_read(ef);
}
-EAPI_DEF Eet_File *
+EAPI Eet_File *
eet_open(const char *file, Eet_File_Mode mode)
{
FILE *fp;
@@ -1235,7 +1235,7 @@
return ef;
}
-EAPI_DEF Eet_File_Mode
+EAPI Eet_File_Mode
eet_mode_get(Eet_File *ef)
{
/* check to see its' an eet file pointer */
@@ -1245,7 +1245,7 @@
return ef->mode;
}
-EAPI_DEF Eet_Error
+EAPI Eet_Error
eet_close(Eet_File *ef)
{
Eet_Error err;
@@ -1318,7 +1318,7 @@
return err;
}
-EAPI_DEF void *
+EAPI void *
eet_read(Eet_File *ef, const char *name, int *size_ret)
{
void *data = NULL;
@@ -1417,7 +1417,7 @@
return data;
}
-EAPI_DEF const void *
+EAPI const void *
eet_read_direct(Eet_File *ef, const char *name, int *size_ret)
{
const void *data = NULL;
@@ -1462,7 +1462,7 @@
return data;
}
-EAPI_DEF int
+EAPI int
eet_write(Eet_File *ef, const char *name, const void *data, int size, int
compress)
{
Eet_File_Node *efn;
@@ -1583,7 +1583,7 @@
return data_size;
}
-EAPI_DEF int
+EAPI int
eet_delete(Eet_File *ef, const char *name)
{
Eet_File_Node *efn;
@@ -1637,7 +1637,7 @@
return exists_already;
}
-EAPI_DEF Eet_Dictionary*
+EAPI Eet_Dictionary*
eet_dictionary_get(Eet_File *ef)
{
if (eet_check_pointer(ef)) return NULL;
@@ -1646,7 +1646,7 @@
}
-EAPI_DEF char **
+EAPI char **
eet_list(Eet_File *ef, const char *glob, int *count_ret)
{
Eet_File_Node *efn;
@@ -1714,7 +1714,7 @@
return list_ret;
}
-EAPI_DEF int
+EAPI int
eet_num_entries(Eet_File *ef)
{
int i, num, ret = 0;
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_memfile.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- eet_memfile.c 1 Mar 2008 06:38:09 -0000 1.14
+++ eet_memfile.c 7 Mar 2008 09:59:37 -0000 1.15
@@ -58,7 +58,7 @@
for (i = 0; i < _eet_memfile_info_num; i++)
free(_eet_memfile_info[i].data);
-
+
free(_eet_memfile_info);
_eet_memfile_info = NULL;
#endif
-------------------------------------------------------------------------
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
