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

Make ef_close() set fids later, so it's cleaned up on error

Browse source 
Just for cleanliness.
This commit is contained in:
Markus Armbruster 2011-04-28 20:52:37 +02:00
parent 5d54e424df
commit f50fc19aab
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ int
ef_open(int type, int how, int nelt) ef_open(int type, int how, int nelt)
{ {
struct empfile *ep; struct empfile *ep;
int oflags, fd, fsiz, nslots; int oflags, fd, fsiz, fids, nslots;
if (ef_check(type) < 0) if (ef_check(type) < 0)
return 0; return 0;
@ -104,10 +104,10 @@ ef_open(int type, int how, int nelt)
close(fd); close(fd);
return 0; return 0;
} }
ep->fids = fsiz / ep->size; fids = fsiz / ep->size;
if (nelt >= 0 && nelt != ep->fids) { if (nelt >= 0 && nelt != fids) {
logerror("Can't open %s (got %d records instead of %d)", logerror("Can't open %s (got %d records instead of %d)",
ep->file, ep->fids, nelt); ep->file, fids, nelt);
close(fd); close(fd);
return 0; return 0;
} }
@ -116,7 +116,7 @@ ef_open(int type, int how, int nelt)
if (ep->flags & EFF_STATIC) { if (ep->flags & EFF_STATIC) {
/* ep->cache already points to space for ep->csize elements */ /* ep->cache already points to space for ep->csize elements */
if (how & EFF_MEM) { if (how & EFF_MEM) {
if (ep->fids > ep->csize) { if (fids > ep->csize) {
logerror("Can't open %s (file larger than %d records)", logerror("Can't open %s (file larger than %d records)",
ep->file, ep->csize); ep->file, ep->csize);
close(fd); close(fd);
@ -127,7 +127,7 @@ ef_open(int type, int how, int nelt)
if (CANT_HAPPEN(ep->cache)) if (CANT_HAPPEN(ep->cache))
free(ep->cache); free(ep->cache);
if (how & EFF_MEM) if (how & EFF_MEM)
nslots = ep->fids; nslots = fids;
else else
nslots = blksize(fd) / ep->size; nslots = blksize(fd) / ep->size;
if (!ef_realloc_cache(ep, nslots)) { if (!ef_realloc_cache(ep, nslots)) {
@ -138,12 +138,13 @@ ef_open(int type, int how, int nelt)
} }
ep->baseid = 0; ep->baseid = 0;
ep->cids = 0; ep->cids = 0;
ep->fids = fids;
ep->flags = (ep->flags & EFF_IMMUTABLE) | (how & ~EFF_CREATE); ep->flags = (ep->flags & EFF_IMMUTABLE) | (how & ~EFF_CREATE);
ep->fd = fd; ep->fd = fd;
/* map file into cache */ /* map file into cache */
if ((how & EFF_MEM) && ep->fids) { if ((how & EFF_MEM) && fids) {
if (fillcache(ep, 0) != ep->fids) { if (fillcache(ep, 0) != fids) {
ep->cids = 0; /* prevent cache flush */ ep->cids = 0; /* prevent cache flush */
ef_close(type); ef_close(type);
return 0; return 0;