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

oops. no mroe seggies! :) 

SVN revision: 11937
This commit is contained in:
Carsten Haitzler 2004-10-21 06:16:55 +00:00
parent c99bdd3681
commit 3489ea4645
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,11 +31,13 @@ struct _Eet_File
Eet_File_Header *header; Eet_File_Header *header;
}; };
struct _Eet_File_Header struct _Eet_File_Header
{ {
int magic; int magic;
Eet_File_Directory *directory; Eet_File_Directory *directory;
}; };
struct _Eet_File_Node struct _Eet_File_Node
{ {
char *name; char *name;
@ -45,11 +47,13 @@ struct _Eet_File_Node
int data_size; int data_size;
void *data; void *data;
}; };
struct _Eet_File_Directory struct _Eet_File_Directory
{ {
int size; int size;
Eet_File_Directory_Hash *hash; Eet_File_Directory_Hash *hash;
}; };
struct _Eet_File_Directory_Hash struct _Eet_File_Directory_Hash
{ {
int size; int size;
@ -116,6 +120,11 @@ eet_cache_add(Eet_File *ef, Eet_File ***cache, int *cache_num)
new_cache = *cache; new_cache = *cache;
new_cache_num++; new_cache_num++;
new_cache = realloc(new_cache, new_cache_num * sizeof(Eet_File *)); new_cache = realloc(new_cache, new_cache_num * sizeof(Eet_File *));
if (!new_cache)
{
fprintf(stderr, "BAD ERROR! Eet realloc of cache list failed. Abort\n");
abort();
}
if (!new_cache) return; if (!new_cache) return;
new_cache[new_cache_num - 1] = ef; new_cache[new_cache_num - 1] = ef;
*cache = new_cache; *cache = new_cache;
@ -132,17 +141,28 @@ eet_cache_del(Eet_File *ef, Eet_File ***cache, int *cache_num)
new_cache_num = *cache_num; new_cache_num = *cache_num;
new_cache = *cache; new_cache = *cache;
if (new_cache_num <= 0) return; if (new_cache_num <= 0)
{
return;
}
for (i = 0; i < new_cache_num; i++) for (i = 0; i < new_cache_num; i++)
{ {
if (new_cache[i] == ef) break; if (new_cache[i] == ef) break;
} }
if (i >= new_cache_num) return; if (i >= new_cache_num)
{
return;
}
new_cache_num--; new_cache_num--;
for (j = i; j < new_cache_num; j++) new_cache[j] = new_cache[j + 1]; for (j = i; j < new_cache_num; j++) new_cache[j] = new_cache[j + 1];
if (new_cache_num > 0) if (new_cache_num > 0)
{ {
new_cache = realloc(new_cache, new_cache_num * sizeof(Eet_File *)); new_cache = realloc(new_cache, new_cache_num * sizeof(Eet_File *));
if (!new_cache)
{
fprintf(stderr, "BAD ERROR! Eet realloc of cache list failed. abort\m");
abort();
}
} }
else else
{ {
@ -150,7 +170,6 @@ eet_cache_del(Eet_File *ef, Eet_File ***cache, int *cache_num)
new_cache = NULL; new_cache = NULL;
} }
*cache_num = new_cache_num; *cache_num = new_cache_num;
if ((new_cache_num > 0) && (!new_cache)) return;
*cache = new_cache; *cache = new_cache;
} }
@ -330,7 +349,7 @@ eet_open(char *file, Eet_File_Mode mode)
ef = NULL; ef = NULL;
if (mode == EET_FILE_MODE_READ) if (mode == EET_FILE_MODE_READ)
ef = eet_cache_find(buf, eet_readers, eet_readers_num); ef = eet_cache_find(buf, eet_readers, eet_readers_num);
else if (mode == EET_FILE_MODE_WRITE) else if ((mode == EET_FILE_MODE_WRITE) || (mode == EET_FILE_MODE_RW))
ef = eet_cache_find(buf, eet_writers, eet_writers_num); ef = eet_cache_find(buf, eet_writers, eet_writers_num);
/* we found one */ /* we found one */
if (ef) if (ef)
@ -621,7 +640,7 @@ eet_close(Eet_File *ef)
/* remove from cache */ /* remove from cache */
if (ef->mode == EET_FILE_MODE_READ) if (ef->mode == EET_FILE_MODE_READ)
eet_cache_del(ef, &eet_readers, &eet_readers_num); eet_cache_del(ef, &eet_readers, &eet_readers_num);
else if (ef->mode == EET_FILE_MODE_WRITE) else if ((ef->mode == EET_FILE_MODE_WRITE) || (ef->mode == EET_FILE_MODE_RW))
eet_cache_del(ef, &eet_writers, &eet_writers_num); eet_cache_del(ef, &eet_writers, &eet_writers_num);
/* flush any writes */ /* flush any writes */
eet_flush(ef); eet_flush(ef);