[Asterisk-cvs] asterisk asterisk.c,1.154,1.155 frame.c,1.55,1.56

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv9196

Modified Files:
	asterisk.c frame.c 
Log Message:
add 'dontwarn' option to asterisk.conf to appease the whining masses :p (bug #4320)


Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- asterisk.c	18 May 2005 01:49:12 -0000	1.154
+++ asterisk.c	19 May 2005 01:57:19 -0000	1.155
@@ -88,6 +88,7 @@
 int option_reconnect = 0;
 int option_transcode_slin = 1;
 int option_maxcalls = 0;
+int option_dontwarn = 0;
 int fully_booted = 0;
 char record_cache_dir[AST_CACHE_DIR_LEN] = AST_TMP_DIR;
 char debug_filename[AST_FILENAME_MAX] = "";
@@ -1647,6 +1648,9 @@
 		/* Disable ANSI colors for console (-c at startup) */
 		} else if (!strcasecmp(v->name, "nocolor")) {
 			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) */
 		} else if (!strcasecmp(v->name, "dumpcore")) {
 			option_dumpcore = ast_true(v->value);

Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- frame.c	15 May 2005 05:46:34 -0000	1.55
+++ frame.c	19 May 2005 01:57:19 -0000	1.56
@@ -578,7 +578,7 @@
 	if ((argc < 2) || (argc > 3))
 		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"
 				"\tIt does not indicate anything about your configuration.\n");