Remove excessive code
This commit is contained in:
parent
be63d2ca19
commit
94edc4f4c5
15
src/main.c
15
src/main.c
@ -355,8 +355,6 @@ done:
|
|||||||
int
|
int
|
||||||
main (int argc, char **argv)
|
main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* Only allow u+rw bits. This may be required for some versions
|
/* Only allow u+rw bits. This may be required for some versions
|
||||||
* of glibc so that mkstemp() doesn't make us vulnerable.
|
* of glibc so that mkstemp() doesn't make us vulnerable.
|
||||||
*/
|
*/
|
||||||
@ -364,23 +362,20 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
log_message (LOG_INFO, "Initializing " PACKAGE " ...");
|
log_message (LOG_INFO, "Initializing " PACKAGE " ...");
|
||||||
|
|
||||||
ret = config_compile_regex();
|
if (config_compile_regex()) {
|
||||||
if (ret != 0) {
|
|
||||||
exit (EX_SOFTWARE);
|
exit (EX_SOFTWARE);
|
||||||
}
|
}
|
||||||
|
|
||||||
initialize_config_defaults (&config_defaults);
|
initialize_config_defaults (&config_defaults);
|
||||||
process_cmdline (argc, argv, &config_defaults);
|
process_cmdline (argc, argv, &config_defaults);
|
||||||
|
|
||||||
ret = reload_config_file (config_defaults.config_file,
|
if (reload_config_file (config_defaults.config_file,
|
||||||
&config,
|
&config,
|
||||||
&config_defaults);
|
&config_defaults)) {
|
||||||
if (ret != 0) {
|
|
||||||
exit (EX_SOFTWARE);
|
exit (EX_SOFTWARE);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = setup_logging ();
|
if (setup_logging ()) {
|
||||||
if (ret != 0) {
|
|
||||||
exit (EX_SOFTWARE);
|
exit (EX_SOFTWARE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user