enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

* 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


SVN revision: 33949
This commit is contained in:
doursse 2008-03-07 09:59:37 +00:00 committed by doursse
parent fad0d39cdc
commit a3b06c3a70
5 changed files with 74 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/eet/src/lib/Eet.h
View File

@ -12,7 +12,6 @@
# else # else
# define EAPI __declspec(dllimport) # define EAPI __declspec(dllimport)
# endif # endif
# define EAPI_DEF
#else #else
# ifdef __GNUC__ # ifdef __GNUC__
# if __GNUC__ >= 4 # if __GNUC__ >= 4
@ -23,7 +22,6 @@
# else # else
# define EAPI # define EAPI
# endif # endif
# define EAPI_DEF EAPI
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

104
legacy/eet/src/lib/eet_data.c
View File

@ -596,7 +596,7 @@ eet_data_put_type(Eet_Dictionary *ed, int type, const void *src, int *size_ret)
* *
* char[4] = "CHnK"; // untyped data ... or * char[4] = "CHnK"; // untyped data ... or
* char[4] = "CHKx"; // typed data - x == type * char[4] = "CHKx"; // typed data - x == type
* *
* int = chunk size (including magic string); * int = chunk size (including magic string);
* char[] = chuck magic/name string (0 byte terminated); * char[] = chuck magic/name string (0 byte terminated);
* ... sub-chunks (a chunk can contain chuncks recusrively) ... * ... sub-chunks (a chunk can contain chuncks recusrively) ...
@ -789,14 +789,14 @@ static void
_eet_descriptor_hash_new(Eet_Data_Descriptor *edd) _eet_descriptor_hash_new(Eet_Data_Descriptor *edd)
{ {
int i; int i;
edd->elements.hash.size = 1 << 6; edd->elements.hash.size = 1 << 6;
edd->elements.hash.buckets = calloc(1, sizeof(Eet_Data_Descriptor_Hash) * edd->elements.hash.size); edd->elements.hash.buckets = calloc(1, sizeof(Eet_Data_Descriptor_Hash) * edd->elements.hash.size);
for (i = 0; i < edd->elements.num; i++) for (i = 0; i < edd->elements.num; i++)
{ {
Eet_Data_Element *ede; Eet_Data_Element *ede;
int hash; int hash;
ede = &(edd->elements.set[i]); ede = &(edd->elements.set[i]);
hash = _eet_hash_gen((char *) ede->name, 6); hash = _eet_hash_gen((char *) ede->name, 6);
if (!edd->elements.hash.buckets[hash].element) if (!edd->elements.hash.buckets[hash].element)
@ -804,7 +804,7 @@ _eet_descriptor_hash_new(Eet_Data_Descriptor *edd)
else else
{ {
Eet_Data_Descriptor_Hash *bucket; Eet_Data_Descriptor_Hash *bucket;
bucket = calloc(1, sizeof(Eet_Data_Descriptor_Hash)); bucket = calloc(1, sizeof(Eet_Data_Descriptor_Hash));
bucket->element = ede; bucket->element = ede;
bucket->next = edd->elements.hash.buckets[hash].next; bucket->next = edd->elements.hash.buckets[hash].next;
@ -817,11 +817,11 @@ static void
_eet_descriptor_hash_free(Eet_Data_Descriptor *edd) _eet_descriptor_hash_free(Eet_Data_Descriptor *edd)
{ {
int i; int i;
for (i = 0; i < edd->elements.hash.size; i++) for (i = 0; i < edd->elements.hash.size; i++)
{ {
Eet_Data_Descriptor_Hash *bucket, *pbucket; Eet_Data_Descriptor_Hash *bucket, *pbucket;
bucket = edd->elements.hash.buckets[i].next; bucket = edd->elements.hash.buckets[i].next;
while (bucket) while (bucket)
{ {
@ -838,7 +838,7 @@ _eet_descriptor_hash_find(Eet_Data_Descriptor *edd, char *name)
{ {
int hash; int hash;
Eet_Data_Descriptor_Hash *bucket; Eet_Data_Descriptor_Hash *bucket;
hash = _eet_hash_gen(name, 6); hash = _eet_hash_gen(name, 6);
if (!edd->elements.hash.buckets[hash].element) return NULL; if (!edd->elements.hash.buckets[hash].element) return NULL;
if (!strcmp(edd->elements.hash.buckets[hash].element->name, name)) if (!strcmp(edd->elements.hash.buckets[hash].element->name, name))
@ -878,7 +878,7 @@ _eet_str_free(const char *str)
/*---*/ /*---*/
EAPI_DEF Eet_Data_Descriptor * EAPI Eet_Data_Descriptor *
eet_data_descriptor_new(const char *name, eet_data_descriptor_new(const char *name,
int size, int size,
void *(*func_list_next) (void *l), void *(*func_list_next) (void *l),
@ -914,7 +914,7 @@ eet_data_descriptor_new(const char *name,
} }
/* new replcement */ /* new replcement */
EAPI_DEF Eet_Data_Descriptor * EAPI Eet_Data_Descriptor *
eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc) eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
{ {
Eet_Data_Descriptor *edd; Eet_Data_Descriptor *edd;
@ -949,7 +949,7 @@ eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
return edd; return edd;
} }
EAPI_DEF Eet_Data_Descriptor * EAPI Eet_Data_Descriptor *
eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc) eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc)
{ {
Eet_Data_Descriptor *edd; Eet_Data_Descriptor *edd;
@ -988,7 +988,7 @@ eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc)
return edd; return edd;
} }
EAPI_DEF void EAPI void
eet_data_descriptor_free(Eet_Data_Descriptor *edd) eet_data_descriptor_free(Eet_Data_Descriptor *edd)
{ {
_eet_descriptor_hash_free(edd); _eet_descriptor_hash_free(edd);
@ -996,8 +996,8 @@ eet_data_descriptor_free(Eet_Data_Descriptor *edd)
free(edd); free(edd);
} }
EAPI_DEF void EAPI void
eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
const char *name, int type, const char *name, int type,
int group_type, int group_type,
int offset, int offset,
@ -1023,7 +1023,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
ede->subtype = subtype; ede->subtype = subtype;
} }
EAPI_DEF void * EAPI void *
eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name) eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
{ {
const Eet_Dictionary *ed = NULL; const Eet_Dictionary *ed = NULL;
@ -1049,7 +1049,7 @@ eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
return data_dec; 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_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const void *data, int compress)
{ {
Eet_Dictionary *ed; Eet_Dictionary *ed;
@ -1267,8 +1267,8 @@ _eet_data_string_escape(const char *str)
for (strp = str; *strp; strp++) for (strp = str; *strp; strp++)
{ {
if (*strp == '\"') sz += 2; if (*strp == '\"') sz += 2;
else if (*strp == '\\') sz += 2; else if (*strp == '\\') sz += 2;
else sz += 1; else sz += 1;
} }
s = malloc(sz + 1); s = malloc(sz + 1);
@ -1295,7 +1295,7 @@ static void
_eet_data_dump_string_escape(void *dumpdata, void dumpfunc(void *data, const char *str), const char *str) _eet_data_dump_string_escape(void *dumpdata, void dumpfunc(void *data, const char *str), const char *str)
{ {
char *s; char *s;
s = _eet_data_string_escape(str); s = _eet_data_string_escape(str);
if (s) if (s)
{ {
@ -1312,7 +1312,7 @@ _eet_data_dump_token_get(const char *src, int *len)
int in_token = 0; int in_token = 0;
int in_quote = 0; int in_quote = 0;
int tlen = 0, tsize = 0; int tlen = 0, tsize = 0;
#define TOK_ADD(x) \ #define TOK_ADD(x) \
{ \ { \
tlen++; \ tlen++; \
@ -1323,7 +1323,7 @@ _eet_data_dump_token_get(const char *src, int *len)
} \ } \
tok[tlen - 1] = x; \ tok[tlen - 1] = x; \
} }
for (p = src; *len > 0; p++, (*len)--) for (p = src; *len > 0; p++, (*len)--)
{ {
if (in_token) if (in_token)
@ -1457,11 +1457,11 @@ _eet_data_dump_encode(Eet_Dictionary *ed,
void *cdata, *data; void *cdata, *data;
int csize, size; int csize, size;
Node *n; Node *n;
if (words_bigendian == -1) if (words_bigendian == -1)
{ {
unsigned long int v; unsigned long int v;
v = htonl(0x12345678); v = htonl(0x12345678);
if (v == 0x12345678) words_bigendian = 1; if (v == 0x12345678) words_bigendian = 1;
else words_bigendian = 0; else words_bigendian = 0;
@ -1469,7 +1469,7 @@ _eet_data_dump_encode(Eet_Dictionary *ed,
ds = eet_data_stream_new(); ds = eet_data_stream_new();
if (!ds) return NULL; if (!ds) return NULL;
switch (node->type) switch (node->type)
{ {
case EET_G_UNKNOWN: case EET_G_UNKNOWN:
@ -1633,7 +1633,7 @@ _eet_data_dump_encode(Eet_Dictionary *ed,
default: default:
break; break;
} }
if ((node->type > EET_G_UNKNOWN) && (node->type < EET_G_LAST)) 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); chnk = eet_data_chunk_new(ds->data, ds->pos, node->name, EET_T_UNKNOW, node->type);
else else
@ -1641,20 +1641,20 @@ _eet_data_dump_encode(Eet_Dictionary *ed,
ds->data = NULL; ds->data = NULL;
ds->size = 0; ds->size = 0;
eet_data_stream_free(ds); eet_data_stream_free(ds);
ds = eet_data_stream_new(); ds = eet_data_stream_new();
eet_data_chunk_put(ed, chnk, ds); eet_data_chunk_put(ed, chnk, ds);
cdata = ds->data; cdata = ds->data;
csize = ds->pos; csize = ds->pos;
ds->data = NULL; ds->data = NULL;
ds->size = 0; ds->size = 0;
eet_data_stream_free(ds); eet_data_stream_free(ds);
*size_ret = csize; *size_ret = csize;
free(chnk->data); free(chnk->data);
eet_data_chunk_free(chnk); eet_data_chunk_free(chnk);
return cdata; return cdata;
} }
@ -1681,7 +1681,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed,
for (p = src; p < (src + size);) for (p = src; p < (src + size);)
{ {
char *tok1, *tok2, *tok3, *tok4; char *tok1, *tok2, *tok3, *tok4;
TOK_GET(tok1); TOK_GET(tok1);
if (tok1) if (tok1)
{ {
@ -1944,7 +1944,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
if (chnk.type == EET_T_UNKNOW) if (chnk.type == EET_T_UNKNOW)
{ {
buf = tbuf; buf = tbuf;
for (i = 0; i < level; i++) dumpfunc(dumpdata, " "); for (i = 0; i < level; i++) dumpfunc(dumpdata, " ");
dumpfunc(dumpdata, "group \""); dumpfunc(dumpdata, "group \"");
_eet_data_dump_string_escape(dumpdata, dumpfunc, chnk.name); _eet_data_dump_string_escape(dumpdata, dumpfunc, chnk.name);
@ -2007,7 +2007,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
{ {
int ret; int ret;
void *data_ret; void *data_ret;
if (IS_SIMPLE_TYPE(type)) if (IS_SIMPLE_TYPE(type))
{ {
ret = eet_data_get_type(ed, ret = eet_data_get_type(ed,
@ -2018,7 +2018,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
if (type == EET_T_STRING) if (type == EET_T_STRING)
{ {
char **str; char **str;
str = (char **)(((char *)data) + ede->offset); str = (char **)(((char *)data) + ede->offset);
if (*str) if (*str)
{ {
@ -2039,7 +2039,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
if (type == EET_T_INLINED_STRING) if (type == EET_T_INLINED_STRING)
{ {
char **str; char **str;
str = (char **)(((char *)data) + ede->offset); str = (char **)(((char *)data) + ede->offset);
if (*str) if (*str)
{ {
@ -2051,7 +2051,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
else if (ede->subtype) else if (ede->subtype)
{ {
void **ptr; void **ptr;
data_ret = _eet_data_descriptor_decode(ed, data_ret = _eet_data_descriptor_decode(ed,
ede->subtype, ede->subtype,
echnk.data, echnk.data,
@ -2080,7 +2080,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
void *list = NULL; void *list = NULL;
void **ptr; void **ptr;
void *data_ret; void *data_ret;
ptr = (void **)(((char *)data) + ede->offset); ptr = (void **)(((char *)data) + ede->offset);
list = *ptr; list = *ptr;
data_ret = NULL; data_ret = NULL;
@ -2125,10 +2125,10 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
void **ptr; void **ptr;
char *key = NULL; char *key = NULL;
void *data_ret = NULL; void *data_ret = NULL;
ptr = (void **)(((char *)data) + ede->offset); ptr = (void **)(((char *)data) + ede->offset);
hash = *ptr; hash = *ptr;
/* Read key */ /* Read key */
ret = eet_data_get_type(ed, ret = eet_data_get_type(ed,
EET_T_STRING, EET_T_STRING,
@ -2136,11 +2136,11 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
((char *)echnk.data) + echnk.size, ((char *)echnk.data) + echnk.size,
&key); &key);
if (ret <= 0) goto error; if (ret <= 0) goto error;
/* Advance to next chunk */ /* Advance to next chunk */
NEXT_CHUNK(p, size, echnk, ed); NEXT_CHUNK(p, size, echnk, ed);
memset(&echnk, 0, sizeof(Eet_Data_Chunk)); memset(&echnk, 0, sizeof(Eet_Data_Chunk));
/* Read value */ /* Read value */
eet_data_chunk_get(ed, &echnk, p, size); eet_data_chunk_get(ed, &echnk, p, size);
if (!echnk.name) goto error; if (!echnk.name) goto error;
@ -2193,7 +2193,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
{ {
unsigned char dd[128]; unsigned char dd[128];
int group_type = EET_G_UNKNOWN, type = EET_T_UNKNOW; int group_type = EET_G_UNKNOWN, type = EET_T_UNKNOW;
if ((echnk.type > EET_T_UNKNOW) && if ((echnk.type > EET_T_UNKNOW) &&
(echnk.type < EET_T_LAST)) (echnk.type < EET_T_LAST))
type = echnk.type; type = echnk.type;
@ -2204,7 +2204,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
{ {
int ret; int ret;
void *data_ret; void *data_ret;
if (IS_SIMPLE_TYPE(type)) if (IS_SIMPLE_TYPE(type))
{ {
ret = eet_data_get_type(ed, ret = eet_data_get_type(ed,
@ -2262,7 +2262,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
case EET_T_STRING: case EET_T_STRING:
{ {
char *s; char *s;
s = *((char **)dd); s = *((char **)dd);
if (s) if (s)
{ {
@ -2325,7 +2325,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
{ {
int ret; int ret;
void *data_ret; void *data_ret;
data_ret = NULL; data_ret = NULL;
if (IS_SIMPLE_TYPE(type)) if (IS_SIMPLE_TYPE(type))
{ {
@ -2354,7 +2354,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
int ret; int ret;
char *key = NULL; char *key = NULL;
void *data_ret = NULL; void *data_ret = NULL;
/* Read key */ /* Read key */
ret = eet_data_get_type(ed, ret = eet_data_get_type(ed,
EET_T_STRING, EET_T_STRING,
@ -2362,11 +2362,11 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
((char *)echnk.data) + echnk.size, ((char *)echnk.data) + echnk.size,
&key); &key);
if (ret <= 0) goto error; if (ret <= 0) goto error;
/* Advance to next chunk */ /* Advance to next chunk */
NEXT_CHUNK(p, size, echnk, ed); NEXT_CHUNK(p, size, echnk, ed);
memset(&echnk, 0, sizeof(Eet_Data_Chunk)); memset(&echnk, 0, sizeof(Eet_Data_Chunk));
/* Read value */ /* Read value */
eet_data_chunk_get(ed, &echnk, p, size); eet_data_chunk_get(ed, &echnk, p, size);
if (!echnk.name) goto error; if (!echnk.name) goto error;
@ -2383,7 +2383,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
else else
{ {
char *s; char *s;
s = key; s = key;
if (s) if (s)
{ {
@ -2419,7 +2419,7 @@ _eet_data_descriptor_decode(const Eet_Dictionary *ed,
/* advance to next chunk */ /* advance to next chunk */
NEXT_CHUNK(p, size, echnk, ed); NEXT_CHUNK(p, size, echnk, ed);
} }
_eet_freelist_unref(); _eet_freelist_unref();
_eet_freelist_str_unref(); _eet_freelist_str_unref();
_eet_freelist_list_unref(); _eet_freelist_list_unref();
@ -2472,7 +2472,7 @@ error:
return NULL; return NULL;
} }
EAPI_DEF int EAPI int
eet_data_text_dump(const void *data_in, eet_data_text_dump(const void *data_in,
int size_in, int size_in,
void (*dumpfunc) (void *data, const char *str), void (*dumpfunc) (void *data, const char *str),
@ -2484,7 +2484,7 @@ eet_data_text_dump(const void *data_in,
return 0; return 0;
} }
EAPI_DEF void * EAPI void *
eet_data_text_undump(const char *text, eet_data_text_undump(const char *text,
int textlen, int textlen,
int *size_ret) int *size_ret)
@ -2492,7 +2492,7 @@ eet_data_text_undump(const char *text,
return _eet_data_dump_parse(NULL, size_ret, text, textlen); return _eet_data_dump_parse(NULL, size_ret, text, textlen);
} }
EAPI_DEF void * EAPI void *
eet_data_descriptor_decode(Eet_Data_Descriptor *edd, eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
const void *data_in, const void *data_in,
int size_in) int size_in)
@ -2632,7 +2632,7 @@ _eet_data_descriptor_encode(Eet_Dictionary *ed,
return cdata; return cdata;
} }
EAPI_DEF void * EAPI void *
eet_data_descriptor_encode(Eet_Data_Descriptor *edd, eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
const void *data_in, const void *data_in,
int *size_ret) int *size_ret)

12
legacy/eet/src/lib/eet_image.c
View File

@ -703,7 +703,7 @@ eet_data_image_jpeg_alpha_convert(int *size, const void *data, unsigned int w, u
return d; return d;
} }
EAPI_DEF int EAPI int
eet_data_image_write(Eet_File *ef, const char *name, eet_data_image_write(Eet_File *ef, const char *name,
const void *data, unsigned int w, unsigned int h, int alpha, const void *data, unsigned int w, unsigned int h, int alpha,
int compress, int quality, int lossy) int compress, int quality, int lossy)
@ -723,7 +723,7 @@ eet_data_image_write(Eet_File *ef, const char *name,
return 0; return 0;
} }
EAPI_DEF void * EAPI void *
eet_data_image_read(Eet_File *ef, const char *name, eet_data_image_read(Eet_File *ef, const char *name,
unsigned int *w, unsigned int *h, int *alpha, unsigned int *w, unsigned int *h, int *alpha,
int *compress, int *quality, int *lossy) int *compress, int *quality, int *lossy)
@ -750,7 +750,7 @@ eet_data_image_read(Eet_File *ef, const char *name,
return d; return d;
} }
EAPI_DEF int EAPI int
eet_data_image_header_read(Eet_File *ef, const char *name, eet_data_image_header_read(Eet_File *ef, const char *name,
unsigned int *w, unsigned int *h, int *alpha, unsigned int *w, unsigned int *h, int *alpha,
int *compress, int *quality, int *lossy) int *compress, int *quality, int *lossy)
@ -775,7 +775,7 @@ eet_data_image_header_read(Eet_File *ef, const char *name,
return d; 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) 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; void *d = NULL;
@ -799,7 +799,7 @@ eet_data_image_encode(const void *data, int *size_ret, unsigned int w, unsigned
return d; 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) 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]; int header[8];
@ -883,7 +883,7 @@ eet_data_image_header_decode(const void *data, int size, unsigned int *w, unsign
return 0; 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) 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; unsigned int *d = NULL;

30
legacy/eet/src/lib/eet_lib.c
View File

@ -599,13 +599,13 @@ write_error:
return EET_ERROR_WRITE_ERROR; return EET_ERROR_WRITE_ERROR;
} }
EAPI_DEF int EAPI int
eet_init(void) eet_init(void)
{ {
return ++eet_initcount; return ++eet_initcount;
} }
EAPI_DEF int EAPI int
eet_shutdown(void) eet_shutdown(void)
{ {
if (--eet_initcount == 0) if (--eet_initcount == 0)
@ -617,7 +617,7 @@ eet_shutdown(void)
return eet_initcount; return eet_initcount;
} }
EAPI_DEF void EAPI void
eet_clearcache(void) eet_clearcache(void)
{ {
int num = 0; int num = 0;
@ -816,7 +816,7 @@ eet_internal_read2(Eet_File *ef)
ef->ed->count = num_dictionary_entries; ef->ed->count = num_dictionary_entries;
ef->ed->start = start + bytes_dictionary_entries + bytes_directory_entries; ef->ed->start = start + bytes_dictionary_entries + bytes_directory_entries;
ef->ed->end = ef->ed->start; ef->ed->end = ef->ed->start;
for (j = 0; j < ef->ed->count; ++j) for (j = 0; j < ef->ed->count; ++j)
{ {
int hash; int hash;
@ -1043,7 +1043,7 @@ eet_internal_read(Eet_File *ef)
return NULL; return NULL;
} }
EAPI_DEF Eet_File * EAPI Eet_File *
eet_memopen_read(const void *data, size_t size) eet_memopen_read(const void *data, size_t size)
{ {
Eet_File *ef; Eet_File *ef;
@ -1070,7 +1070,7 @@ eet_memopen_read(const void *data, size_t size)
return eet_internal_read(ef); return eet_internal_read(ef);
} }
EAPI_DEF Eet_File * EAPI Eet_File *
eet_open(const char *file, Eet_File_Mode mode) eet_open(const char *file, Eet_File_Mode mode)
{ {
FILE *fp; FILE *fp;
@ -1235,7 +1235,7 @@ eet_open(const char *file, Eet_File_Mode mode)
return ef; return ef;
} }
EAPI_DEF Eet_File_Mode EAPI Eet_File_Mode
eet_mode_get(Eet_File *ef) eet_mode_get(Eet_File *ef)
{ {
/* check to see its' an eet file pointer */ /* check to see its' an eet file pointer */
@ -1245,7 +1245,7 @@ eet_mode_get(Eet_File *ef)
return ef->mode; return ef->mode;
} }
EAPI_DEF Eet_Error EAPI Eet_Error
eet_close(Eet_File *ef) eet_close(Eet_File *ef)
{ {
Eet_Error err; Eet_Error err;
@ -1318,7 +1318,7 @@ eet_close(Eet_File *ef)
return err; return err;
} }
EAPI_DEF void * EAPI void *
eet_read(Eet_File *ef, const char *name, int *size_ret) eet_read(Eet_File *ef, const char *name, int *size_ret)
{ {
void *data = NULL; void *data = NULL;
@ -1417,7 +1417,7 @@ eet_read(Eet_File *ef, const char *name, int *size_ret)
return data; return data;
} }
EAPI_DEF const void * EAPI const void *
eet_read_direct(Eet_File *ef, const char *name, int *size_ret) eet_read_direct(Eet_File *ef, const char *name, int *size_ret)
{ {
const void *data = NULL; const void *data = NULL;
@ -1462,7 +1462,7 @@ eet_read_direct(Eet_File *ef, const char *name, int *size_ret)
return data; return data;
} }
EAPI_DEF int EAPI int
eet_write(Eet_File *ef, const char *name, const void *data, int size, int compress) eet_write(Eet_File *ef, const char *name, const void *data, int size, int compress)
{ {
Eet_File_Node *efn; Eet_File_Node *efn;
@ -1583,7 +1583,7 @@ eet_write(Eet_File *ef, const char *name, const void *data, int size, int compre
return data_size; return data_size;
} }
EAPI_DEF int EAPI int
eet_delete(Eet_File *ef, const char *name) eet_delete(Eet_File *ef, const char *name)
{ {
Eet_File_Node *efn; Eet_File_Node *efn;
@ -1637,7 +1637,7 @@ eet_delete(Eet_File *ef, const char *name)
return exists_already; return exists_already;
} }
EAPI_DEF Eet_Dictionary* EAPI Eet_Dictionary*
eet_dictionary_get(Eet_File *ef) eet_dictionary_get(Eet_File *ef)
{ {
if (eet_check_pointer(ef)) return NULL; if (eet_check_pointer(ef)) return NULL;
@ -1646,7 +1646,7 @@ eet_dictionary_get(Eet_File *ef)
} }
EAPI_DEF char ** EAPI char **
eet_list(Eet_File *ef, const char *glob, int *count_ret) eet_list(Eet_File *ef, const char *glob, int *count_ret)
{ {
Eet_File_Node *efn; Eet_File_Node *efn;
@ -1714,7 +1714,7 @@ eet_list(Eet_File *ef, const char *glob, int *count_ret)
return list_ret; return list_ret;
} }
EAPI_DEF int EAPI int
eet_num_entries(Eet_File *ef) eet_num_entries(Eet_File *ef)
{ {
int i, num, ret = 0; int i, num, ret = 0;

2
legacy/eet/src/lib/eet_memfile.c
View File

@ -58,7 +58,7 @@ void _eet_memfile_shutdown()
for (i = 0; i < _eet_memfile_info_num; i++) for (i = 0; i < _eet_memfile_info_num; i++)
free(_eet_memfile_info[i].data); free(_eet_memfile_info[i].data);
free(_eet_memfile_info); free(_eet_memfile_info);
_eet_memfile_info = NULL; _eet_memfile_info = NULL;
#endif #endif