mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2025-01-15 13:31:54 +00:00
Displaced bird_name to log.c where it rightfully belongs
This commit is contained in:
parent
bb183c9d0c
commit
7f6284f661
@ -36,6 +36,7 @@ static pool *log_pool;
|
|||||||
|
|
||||||
static struct rfile *dbg_rf;
|
static struct rfile *dbg_rf;
|
||||||
static char *current_syslog_name = NULL; /* NULL -> syslog closed */
|
static char *current_syslog_name = NULL; /* NULL -> syslog closed */
|
||||||
|
const char *bird_name = NULL;
|
||||||
|
|
||||||
_Atomic uint max_thread_id = 1;
|
_Atomic uint max_thread_id = 1;
|
||||||
_Thread_local uint this_thread_id;
|
_Thread_local uint this_thread_id;
|
||||||
@ -826,6 +827,7 @@ resolve_fail:
|
|||||||
void
|
void
|
||||||
log_init_debug(char *f)
|
log_init_debug(char *f)
|
||||||
{
|
{
|
||||||
|
ASSERT_DIE(bird_name);
|
||||||
clock_gettime(CLOCK_MONOTONIC, &dbg_time_start);
|
clock_gettime(CLOCK_MONOTONIC, &dbg_time_start);
|
||||||
|
|
||||||
if (dbg_rf && dbg_rf != &rf_stderr)
|
if (dbg_rf && dbg_rf != &rf_stderr)
|
||||||
|
@ -709,7 +709,6 @@ signal_init(void)
|
|||||||
|
|
||||||
static char *opt_list = "bc:dD:ps:P:u:g:flRh";
|
static char *opt_list = "bc:dD:ps:P:u:g:flRh";
|
||||||
int parse_and_exit;
|
int parse_and_exit;
|
||||||
char *bird_name;
|
|
||||||
static char *use_user;
|
static char *use_user;
|
||||||
static char *use_group;
|
static char *use_group;
|
||||||
static int run_in_foreground = 0;
|
static int run_in_foreground = 0;
|
||||||
|
@ -24,7 +24,7 @@ struct config;
|
|||||||
|
|
||||||
/* main.c */
|
/* main.c */
|
||||||
|
|
||||||
extern char *bird_name;
|
extern const char *bird_name;
|
||||||
extern int parse_and_exit;
|
extern int parse_and_exit;
|
||||||
void async_config(void);
|
void async_config(void);
|
||||||
void async_dump(void);
|
void async_dump(void);
|
||||||
|
@ -539,7 +539,6 @@ bt_is_char(byte c)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
int parse_and_exit;
|
int parse_and_exit;
|
||||||
char *bird_name;
|
|
||||||
void async_config(void) {}
|
void async_config(void) {}
|
||||||
void async_dump(void) {}
|
void async_dump(void) {}
|
||||||
void async_shutdown(void) {}
|
void async_shutdown(void) {}
|
||||||
|
Loading…
Reference in New Issue
Block a user