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

Check argument of ef_cadef(), ef_nelem(), ef_flags(), ef_mtime()

Browse source 
This removes any need for calling ef_check() outside of file.c.
Remove its only occurence, from symval(), and give it internal
linkage.
This commit is contained in:
Markus Armbruster 2008-09-01 09:34:16 -04:00
parent 1492845c12
commit 50cfdcb5a7
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ static int do_write(struct empfile *, void *, int, int);
static unsigned get_seqno(struct empfile *, int);
static void new_seqno(struct empfile *, void *);
static void do_blank(struct empfile *, void *, int, int);
static int ef_check(int);
/*
* Open the file-backed table TYPE (EF_SECTOR, ...).
@ -691,24 +692,32 @@ ef_truncate(int type, int count)
struct castr *
ef_cadef(int type)
{
if (ef_check(type) < 0)
return NULL;
return empfile[type].cadef;
}
int
ef_nelem(int type)
{
if (ef_check(type) < 0)
return 0;
return empfile[type].fids;
}
int
ef_flags(int type)
{
if (ef_check(type) < 0)
return 0;
return empfile[type].flags;
}
time_t
ef_mtime(int type)
{
if (ef_check(type) < 0)
return 0;
if (empfile[type].fd <= 0)
return 0;
return fdate(empfile[type].fd);
@ -765,7 +774,7 @@ ef_nameof(int type)
return empfile[type].name;
}
int
static int
ef_check(int type)
{
if (CANT_HAPPEN((unsigned)type >= EF_MAX))