kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

add 'dontwarn' option to asterisk.conf to appease the whining masses :p (bug #4320)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-05-19 01:57:19 +00:00
parent 53d655cf0a
commit 3c98814bb5
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asterisk.c
View File

@@ -88,6 +88,7 @@ int option_overrideconfig = 0;
int option_reconnect = 0; int option_reconnect = 0;
int option_transcode_slin = 1; int option_transcode_slin = 1;
int option_maxcalls = 0; int option_maxcalls = 0;
int option_dontwarn = 0;
int fully_booted = 0; int fully_booted = 0;
char record_cache_dir[AST_CACHE_DIR_LEN] = AST_TMP_DIR; char record_cache_dir[AST_CACHE_DIR_LEN] = AST_TMP_DIR;
char debug_filename[AST_FILENAME_MAX] = ""; char debug_filename[AST_FILENAME_MAX] = "";
@@ -1647,6 +1648,9 @@ static void ast_readconfig(void) {
/* Disable ANSI colors for console (-c at startup) */ /* Disable ANSI colors for console (-c at startup) */
} else if (!strcasecmp(v->name, "nocolor")) { } else if (!strcasecmp(v->name, "nocolor")) {
option_nocolor = ast_true(v->value); option_nocolor = ast_true(v->value);
/* Disable some usage warnings for picky people :p */
} else if (!strcasecmp(v->name, "dontwarn")) {
option_dontwarn = ast_true(v->value);
/* Dump core in case of crash (-g) */ /* Dump core in case of crash (-g) */
} else if (!strcasecmp(v->name, "dumpcore")) { } else if (!strcasecmp(v->name, "dumpcore")) {
option_dumpcore = ast_true(v->value); option_dumpcore = ast_true(v->value);

2
frame.c
View File

@@ -578,7 +578,7 @@ static int show_codecs(int fd, int argc, char *argv[])
if ((argc < 2) || (argc > 3)) if ((argc < 2) || (argc > 3))
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
if (getenv("I_AM_NOT_AN_IDIOT") == NULL) if (!option_dontwarn)
ast_cli(fd, "Disclaimer: this command is for informational purposes only.\n" ast_cli(fd, "Disclaimer: this command is for informational purposes only.\n"
"\tIt does not indicate anything about your configuration.\n"); "\tIt does not indicate anything about your configuration.\n");

1
include/asterisk/options.h
View File

@@ -34,6 +34,7 @@ extern int option_cache_record_files;
extern int option_timestamp; extern int option_timestamp;
extern int option_transcode_slin; extern int option_transcode_slin;
extern int option_maxcalls; extern int option_maxcalls;
extern int option_dontwarn;
extern char defaultlanguage[]; extern char defaultlanguage[];
extern time_t ast_startuptime; extern time_t ast_startuptime;
extern time_t ast_lastreloadtime; extern time_t ast_lastreloadtime;

3
pbx/pbx_config.c
View File

@@ -14,6 +14,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "asterisk/pbx.h" #include "asterisk/pbx.h"
#include "asterisk/config.h" #include "asterisk/config.h"
#include "asterisk/options.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/logger.h" #include "asterisk/logger.h"
#include "asterisk/cli.h" #include "asterisk/cli.h"
@@ -1742,8 +1743,10 @@ static int pbx_load_module(void)
if (plus) if (plus)
ipri += atoi(plus); ipri += atoi(plus);
lastpri = ipri; lastpri = ipri;
if(!option_dontwarn) {
if (!strcmp(realext, "_.")) if (!strcmp(realext, "_."))
ast_log(LOG_WARNING, "The use of '_.' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X.' instead at line %d\n", v->lineno); ast_log(LOG_WARNING, "The use of '_.' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X.' instead at line %d\n", v->lineno);
}
if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, strdup(data), FREE, registrar)) { if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, strdup(data), FREE, registrar)) {
ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno); ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno);
} }