empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ef_open): Implement EFF_STATIC.

Browse source 
(ef_open): Simplify dynamic buffer allocation.
This commit is contained in:
Markus Armbruster 2005-10-26 16:49:52 +00:00
parent e6145fa515
commit 71908018ec
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/lib/common/file.c
View file

@ -96,24 +96,28 @@ ef_open(int type, int how)
ep->fids = fsiz / ep->size;
/* allocate cache */
if (CANT_HAPPEN(ep->flags & EFF_STATIC)) {
/* not implemented */
ep->flags &= ~EFF_STATIC;
}
if (how & EFF_MEM)
ep->csize = ep->fids;
else
ep->csize = max(1, blksize(fd) / ep->size);
size = ep->csize * ep->size;
if (size) {
if (ep->flags & EFF_STATIC) {
/* ep->cache already points to space for e->csize elements */
if (how & EFF_MEM) {
if (ep->fids > ep->csize) {
logerror("Can't open %s: file larger than %d bytes",
ep->file, ep->fids * ep->size);
close(fd);
return 0;
}
}
} else {
if (how & EFF_MEM)
ep->csize = ep->fids;
else
ep->csize = max(1, blksize(fd) / ep->size);
size = ep->csize * ep->size;
ep->cache = malloc(size);
if (ep->cache == NULL) {
if (ep->cache == NULL && size) {
logerror("Can't open %s: out of memory", ep->file);
close(fd);
return 0;
}
} else {
ep->cache = NULL;
}
ep->baseid = 0;
ep->cids = 0;