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

(ef_open): EFF_STATIC and cache not null can't happen.

Browse source 
(ef_open): Leave check of fd to do_write().
This commit is contained in:
Markus Armbruster 2005-10-30 18:48:55 +00:00
parent dd019b605c
commit 4cbb45d0e0
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,8 @@ ef_open(int type, int how)
else
ep->csize = max(1, blksize(fd) / ep->size);
size = ep->csize * ep->size;
if (CANT_HAPPEN(ep->cache))
free(ep->cache);
ep->cache = malloc(size);
if (ep->cache == NULL && size) {
logerror("Can't open %s: out of memory", ep->file);
@ -136,6 +138,11 @@ ef_open(int type, int how)
}
}
/*
* Could close fd if both EFF_RDONLY and EFF_MEM, but that doesn't
* happen, so don't bother.
*/
return 1;
}
@ -345,8 +352,6 @@ ef_write(int type, int id, void *from)
if (ef_check(type) < 0)
return 0;
ep = &empfile[type];
if (CANT_HAPPEN(ep->fd < 0))
return 0;
if (ep->prewrite)
ep->prewrite(id, from);
if (CANT_HAPPEN((ep->flags & EFF_MEM) ? id >= ep->fids : id > ep->fids))
@ -367,7 +372,7 @@ ef_write(int type, int id, void *from)
/*
* Extend the file-backed table TYPE by COUNT elements.
* Return the ID of the first new element, or -1 on failure.
* Return non-zero on success, zero on failure.
*/
int
ef_extend(int type, int count)