New way to read configuration tables:

(config_tables): New econfig key.
(read_config_tables): New, implements config_tables.
(main): Call it.  Need to call ef_init() and chdir(configdir) first.
(ef_init_srv): Don't call ef_init(), since main() did it already.

Remove old way to do the same:
(ef_load): Remove, along with calls.
(empfile): Set configuration tables' member file back to NULL.
This commit is contained in:
Markus Armbruster 2006-02-18 13:57:52 +00:00
parent e4865d473e
commit bd65a84eb5
8 changed files with 68 additions and 43 deletions

View file

@ -59,19 +59,13 @@ static void ef_fina_view(int);
/*
* Initialize empfile for full server operations.
* Like ef_init(), but additionally installs the server's callbacks.
* This is separate from ef_init(), so that utility programs like
* files can use empfile.
* ef_init() must be called first.
*/
void
ef_init_srv(void)
{
unsigned i;
ef_init();
if (ef_load() < 0)
exit(EXIT_FAILURE);
for (i = 0; i < sizeof(fileinit) / sizeof(fileinit[0]); i++) {
empfile[fileinit[i].ef_type].init = fileinit[i].init;
empfile[fileinit[i].ef_type].postread = fileinit[i].postread;