diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-11-08 19:27:58 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2016-11-08 19:27:58 +0100 |
| commit | 8860e991f6650e47cfe6c1af595fe4fe92a4edfd (patch) | |
| tree | 18f49bb3a21739a1a596b54d9f65e82cff4fc09f /conf/conf.h | |
| parent | cc5b93f72db80abd1262a0a5e1d8400ceef54385 (diff) | |
| parent | c8cafc8ebb5320ac7c6117c17e6460036f0fdf62 (diff) | |
Merge branch 'master' into int-new
Diffstat (limited to 'conf/conf.h')
| -rw-r--r-- | conf/conf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/conf.h b/conf/conf.h index 03fecd32..593a5f13 100644 --- a/conf/conf.h +++ b/conf/conf.h @@ -20,7 +20,7 @@ struct config { linpool *mem; /* Linear pool containing configuration data */ list protos; /* Configured protocol instances (struct proto_config) */ list tables; /* Configured routing tables (struct rtable_config) */ - list logfiles; /* Configured log fils (sysdep) */ + list logfiles; /* Configured log files (sysdep) */ int mrtdump_file; /* Configured MRTDump file (sysdep, fd in unix) */ char *syslog_name; /* Name used for syslog (NULL -> no syslog) */ @@ -60,7 +60,7 @@ struct config { extern struct config *config; /* Currently active configuration */ extern struct config *new_config; /* Configuration being parsed */ -struct config *config_alloc(byte *name); +struct config *config_alloc(const byte *name); int config_parse(struct config *); int cli_parse(struct config *); void config_free(struct config *); @@ -94,7 +94,7 @@ extern linpool *cfg_mem; #define cfg_alloc(size) lp_alloc(cfg_mem, size) #define cfg_allocu(size) lp_allocu(cfg_mem, size) #define cfg_allocz(size) lp_allocz(cfg_mem, size) -char *cfg_strdup(char *c); +char *cfg_strdup(const char *c); void cfg_copy_list(list *dest, list *src, unsigned node_size); /* Lexer */ |