[Asterisk-cvs] asterisk cli.c,1.51,1.52 loader.c,1.25,1.26

[markster at lists.digium.com]

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

Modified Files:
	cli.c loader.c 
Log Message:
reload documentation, don't display res in app_test...


Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- cli.c	3 Sep 2004 03:44:35 -0000	1.51
+++ cli.c	3 Sep 2004 14:02:12 -0000	1.52
@@ -82,9 +82,9 @@
 "       a more easily machine parsable format\n";
 
 static char reload_help[] = 
-"Usage: reload\n"
-"       Reloads configuration files for all modules which support\n"
-"       reloading.\n";
+"Usage: reload [module ...]\n"
+"       Reloads configuration files for all listed modules which support\n"
+"       reloading, or for all supported modules if none are listed.\n";
 
 static char set_verbose_help[] = 
 "Usage: set verbose <level>\n"

Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- loader.c	2 Sep 2004 20:45:24 -0000	1.25
+++ loader.c	3 Sep 2004 14:02:12 -0000	1.26
@@ -157,10 +157,14 @@
 		ast_verbose("The previous reload command didn't finish yet\n");
 		return;
 	}
-	read_ast_cust_config();
-	reload_manager();
-	ast_enum_reload();
-	ast_rtp_reload();
+	if (!name || !strcasecmp(name, "astconfig"))
+		read_ast_cust_config();
+	if (!name || !strcasecmp(name, "manager"))
+		reload_manager();
+	if (!name || !strcasecmp(name, "enum"))
+		ast_enum_reload();
+	if (!name || !strcasecmp(name, "rtp"))
+		ast_rtp_reload();
 	time(&ast_lastreloadtime);
 
 	ast_mutex_lock(&modlock);