From b5f18d167795f7792483bcf5f4f483bdfb8c9df3 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 24 Jun 2013 21:40:52 +0000
Subject: Fix menuselect display for stasis modules.

The menuselect parser is very simple.  It looks for AST_MODULE_INFO and
uses any quoted string on that line as the module summary display.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_stasis.c                | 4 +---
 res/res_chan_stats.c             | 4 +---
 res/res_stasis.c                 | 8 ++++----
 res/res_stasis_answer.c          | 3 +--
 res/res_stasis_bridge_add.c      | 3 +--
 res/res_stasis_http.c            | 4 +---
 res/res_stasis_http_asterisk.c   | 3 +--
 res/res_stasis_http_bridges.c    | 3 +--
 res/res_stasis_http_channels.c   | 3 +--
 res/res_stasis_http_endpoints.c  | 3 +--
 res/res_stasis_http_events.c     | 3 +--
 res/res_stasis_http_playback.c   | 3 +--
 res/res_stasis_http_recordings.c | 3 +--
 res/res_stasis_http_sounds.c     | 3 +--
 res/res_stasis_json_asterisk.c   | 3 +--
 res/res_stasis_json_bridges.c    | 3 +--
 res/res_stasis_json_channels.c   | 3 +--
 res/res_stasis_json_endpoints.c  | 3 +--
 res/res_stasis_json_events.c     | 3 +--
 res/res_stasis_json_playback.c   | 3 +--
 res/res_stasis_json_recordings.c | 3 +--
 res/res_stasis_json_sounds.c     | 3 +--
 res/res_stasis_playback.c        | 3 +--
 res/res_stasis_test.c            | 9 ++++-----
 res/res_stasis_websocket.c       | 5 ++---
 res/res_statsd.c                 | 4 +---
 26 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index 2d1b2f7c0..ab6046b9b 100644
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -106,9 +106,7 @@ static int unload_module(void)
 	return r;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY,
-	AST_MODFLAG_DEFAULT,
-	"Stasis dialplan application",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan application",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis",
diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index d54ba2f0b..0f39f071f 100644
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -179,9 +179,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY,
-	AST_MODFLAG_DEFAULT,
-	"Example of how to use Stasis",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Example of how to use Stasis",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_statsd"
diff --git a/res/res_stasis.c b/res/res_stasis.c
index 5227654f3..de432e409 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -1018,7 +1018,7 @@ static int unload_module(void)
 	return r;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
-		"Stasis application support",
-		.load = load_module,
-		.unload = unload_module);
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application support",
+	.load = load_module,
+	.unload = unload_module,
+	);
diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c
index 53d4b06e2..257afb5c6 100644
--- a/res/res_stasis_answer.c
+++ b/res/res_stasis_answer.c
@@ -75,8 +75,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
-	"Stasis application answer support",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application answer support",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis");
diff --git a/res/res_stasis_bridge_add.c b/res/res_stasis_bridge_add.c
index 73340d1bb..5ff3b255e 100644
--- a/res/res_stasis_bridge_add.c
+++ b/res/res_stasis_bridge_add.c
@@ -66,8 +66,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
-	"Stasis application bridge add channel support",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application bridge add channel support",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis");
diff --git a/res/res_stasis_http.c b/res/res_stasis_http.c
index 09ab9dc1d..99622f067 100644
--- a/res/res_stasis_http.c
+++ b/res/res_stasis_http.c
@@ -937,9 +937,7 @@ static int reload_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY,
-	AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis HTTP bindings",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis HTTP bindings",
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload_module,
diff --git a/res/res_stasis_http_asterisk.c b/res/res_stasis_http_asterisk.c
index f8b6ea767..d5e8e3fde 100644
--- a/res/res_stasis_http_asterisk.c
+++ b/res/res_stasis_http_asterisk.c
@@ -99,8 +99,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - Asterisk resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Asterisk resources",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_http_bridges.c b/res/res_stasis_http_bridges.c
index a2301195c..757af1f23 100644
--- a/res/res_stasis_http_bridges.c
+++ b/res/res_stasis_http_bridges.c
@@ -287,8 +287,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - Bridge resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_http_channels.c b/res/res_stasis_http_channels.c
index ace351bad..87f663d94 100644
--- a/res/res_stasis_http_channels.c
+++ b/res/res_stasis_http_channels.c
@@ -521,8 +521,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - Channel resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Channel resources",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_http_endpoints.c b/res/res_stasis_http_endpoints.c
index e05031e63..2170784eb 100644
--- a/res/res_stasis_http_endpoints.c
+++ b/res/res_stasis_http_endpoints.c
@@ -150,8 +150,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - Endpoint resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Endpoint resources",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_http_events.c b/res/res_stasis_http_events.c
index 7c6ed445f..800efb9b9 100644
--- a/res/res_stasis_http_events.c
+++ b/res/res_stasis_http_events.c
@@ -91,8 +91,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - WebSocket resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - WebSocket resource",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_http_playback.c b/res/res_stasis_http_playback.c
index ad16de11d..31c04bac6 100644
--- a/res/res_stasis_http_playback.c
+++ b/res/res_stasis_http_playback.c
@@ -160,8 +160,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - Playback control resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Playback control resources",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_http_recordings.c b/res/res_stasis_http_recordings.c
index 687dec4ed..cd421138f 100644
--- a/res/res_stasis_http_recordings.c
+++ b/res/res_stasis_http_recordings.c
@@ -394,8 +394,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - Recording resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Recording resources",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_http_sounds.c b/res/res_stasis_http_sounds.c
index ef761011e..7dce38ed1 100644
--- a/res/res_stasis_http_sounds.c
+++ b/res/res_stasis_http_sounds.c
@@ -126,8 +126,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
-	"RESTful API module - Sound resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sound resources",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis_http,res_stasis",
diff --git a/res/res_stasis_json_asterisk.c b/res/res_stasis_json_asterisk.c
index 8a9c9cd16..830a2cfab 100644
--- a/res/res_stasis_json_asterisk.c
+++ b/res/res_stasis_json_asterisk.c
@@ -52,8 +52,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - Asterisk resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Asterisk resources",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_json_bridges.c b/res/res_stasis_json_bridges.c
index 9b2aac3f1..90977bff4 100644
--- a/res/res_stasis_json_bridges.c
+++ b/res/res_stasis_json_bridges.c
@@ -52,8 +52,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - Bridge resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Bridge resources",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_json_channels.c b/res/res_stasis_json_channels.c
index 54490f2f9..3f85736b3 100644
--- a/res/res_stasis_json_channels.c
+++ b/res/res_stasis_json_channels.c
@@ -52,8 +52,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - Channel resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Channel resources",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_json_endpoints.c b/res/res_stasis_json_endpoints.c
index 0c1e07f9f..be214e038 100644
--- a/res/res_stasis_json_endpoints.c
+++ b/res/res_stasis_json_endpoints.c
@@ -52,8 +52,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - Endpoint resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Endpoint resources",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_json_events.c b/res/res_stasis_json_events.c
index 3116545be..4b966e235 100644
--- a/res/res_stasis_json_events.c
+++ b/res/res_stasis_json_events.c
@@ -811,8 +811,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - WebSocket resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - WebSocket resource",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_json_playback.c b/res/res_stasis_json_playback.c
index 9df75a6cf..16218c92d 100644
--- a/res/res_stasis_json_playback.c
+++ b/res/res_stasis_json_playback.c
@@ -52,8 +52,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - Playback control resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Playback control resources",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_json_recordings.c b/res/res_stasis_json_recordings.c
index af9bef0e4..73935dede 100644
--- a/res/res_stasis_json_recordings.c
+++ b/res/res_stasis_json_recordings.c
@@ -52,8 +52,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - Recording resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Recording resources",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_json_sounds.c b/res/res_stasis_json_sounds.c
index 6c22d03b6..cc6d5ae17 100644
--- a/res/res_stasis_json_sounds.c
+++ b/res/res_stasis_json_sounds.c
@@ -52,8 +52,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis JSON Generators and Validators - Sound resources",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Sound resources",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_DEFAULT,
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index a5f7303d6..3b092df2d 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -480,8 +480,7 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
-	"Stasis application playback support",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application playback support",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis");
diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index 372efbe94..58df8c145 100644
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -103,8 +103,9 @@ struct stasis_message_sink *stasis_message_sink_create(void)
  * Why the roundabout way of exposing this via stasis_message_sink_cb()? Well,
  * it has to do with how we load modules.
  *
- * Modules have their own metadata compiled into them in the AST_MODULE_INFO()
- * block. This includes dependency information in the \c nonoptreq field.
+ * Modules have their own metadata compiled into them in the module info block
+ * at the end of the file.  This includes dependency information in the
+ * \c nonoptreq field.
  *
  * Asterisk loads the module, inspects the field, then loads any needed
  * dependencies. This works because Asterisk passes \c RTLD_LAZY to the initial
@@ -274,9 +275,7 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY,
-	AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Stasis test utilities",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis test utilities",
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND,
diff --git a/res/res_stasis_websocket.c b/res/res_stasis_websocket.c
index 50fec0625..5d6dcb6a9 100644
--- a/res/res_stasis_websocket.c
+++ b/res/res_stasis_websocket.c
@@ -285,10 +285,9 @@ static int unload_module(void)
 	return r;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER,
-	"Stasis HTTP bindings",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Stasis HTTP bindings",
 	.load = load_module,
 	.unload = unload_module,
 	.nonoptreq = "res_stasis,res_http_websocket",
 	.load_pri = AST_MODPRI_APP_DEPEND,
-        );
+	);
diff --git a/res/res_statsd.c b/res/res_statsd.c
index 12963bf5f..4cdcb44ca 100644
--- a/res/res_statsd.c
+++ b/res/res_statsd.c
@@ -316,9 +316,7 @@ static int reload_module(void)
 /* The priority of this module is set to be as low as possible, since it could
  * be used by any other sort of module.
  */
-AST_MODULE_INFO(ASTERISK_GPL_KEY,
-	AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
-	"Statsd client support",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Statsd client support",
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload_module,
-- 
cgit v1.2.3