bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move initialize_config_defaults to conf.c

Browse Source
This commit is contained in:
rofl0r 2020-01-15 14:17:13 +00:00
parent cd005a94ce
commit 25205fd1f3
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/conf.c
View File

@ -442,6 +442,28 @@ done:
return ret; return ret;
} }
void initialize_config_defaults (struct config_s *conf)
{
memset (conf, 0, sizeof(*conf));
conf->config_file = safestrdup (SYSCONFDIR "/tinyproxy.conf");
if (!conf->config_file) {
fprintf (stderr, PACKAGE ": Could not allocate memory.\n");
exit (EX_SOFTWARE);
}
conf->godaemon = TRUE;
/*
* Make sure the HTML error pages array is NULL to begin with.
* (FIXME: Should have a better API for all this)
*/
conf->errorpages = NULL;
conf->stathost = safestrdup (TINYPROXY_STATHOST);
conf->idletimeout = MAX_IDLE_TIME;
conf->logf_name = NULL;
conf->pidpath = NULL;
conf->maxclients = 100;
}
static void initialize_with_defaults (struct config_s *conf, static void initialize_with_defaults (struct config_s *conf,
struct config_s *defaults) struct config_s *defaults)
{ {

2
src/conf.h
View File

@ -114,6 +114,8 @@ struct config_s {
vector_t add_headers; vector_t add_headers;
}; };
void initialize_config_defaults (struct config_s *conf);
extern int reload_config_file (const char *config_fname, struct config_s *conf, extern int reload_config_file (const char *config_fname, struct config_s *conf,
struct config_s *defaults); struct config_s *defaults);

22
src/main.c
View File

@ -284,28 +284,6 @@ change_user (const char *program)
} }
} }
static void initialize_config_defaults (struct config_s *conf)
{
memset (conf, 0, sizeof(*conf));
conf->config_file = safestrdup (SYSCONFDIR "/tinyproxy.conf");
if (!conf->config_file) {
fprintf (stderr, PACKAGE ": Could not allocate memory.\n");
exit (EX_SOFTWARE);
}
conf->godaemon = TRUE;
/*
* Make sure the HTML error pages array is NULL to begin with.
* (FIXME: Should have a better API for all this)
*/
conf->errorpages = NULL;
conf->stathost = safestrdup (TINYPROXY_STATHOST);
conf->idletimeout = MAX_IDLE_TIME;
conf->logf_name = NULL;
conf->pidpath = NULL;
conf->maxclients = 100;
}
/** /**
* convenience wrapper around reload_config_file * convenience wrapper around reload_config_file
* that also re-initializes logging. * that also re-initializes logging.