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

diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index 2d1b2f7c0ee360c2533348a9f14d9a2fb20df973..ab6046b9b08872e1b36f76b20406c3964b13e7b3 100644 (file)
--- 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 d54ba2f0b3bf002f771b8cd73c9127eab4d692ce..0f39f071fb7934682215141ad97830dfa474d004 100644 (file)
--- 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 5227654f34e9d86f21d68a0103d2af38c3c537da..de432e409bd2dcb6acc7f6457b7004b1d9e81c96 100644 (file)
--- 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 53d4b06e28abb6294940d6f5b0a68464504edcba..257afb5c6ba0809119439e786899dc46ce816a08 100644 (file)
--- 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 73340d1bb0059cec78172d9313ac6362550864c8..5ff3b255e46ecaefee6d4688d045f4fa6f721ac8 100644 (file)
--- 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 09ab9dc1dddb2c94d050510cd640dd67d2622f8b..99622f0674d6a5b115e7bb050b8e428739fdea3c 100644 (file)
--- 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 f8b6ea767e97d80233cde6eac17859d7b8ef9908..d5e8e3fdefdd368bf9d7d71a7a835e7ea46cd1ad 100644 (file)
--- 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 a2301195c9ec3443e2f75b34be0b42acfcde43c1..757af1f232d81c7c058a035bbeec80a345d4d9ff 100644 (file)
--- 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 ace351bad42c3766b39238bc47423d8f8ae182b0..87f663d946ff01513f162bfd6bee3959ba390c1d 100644 (file)
--- 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 e05031e638eef014b6b669d30b1eb23c1b2d6306..2170784eba71fb0c70dda5b6ca5b40da9e5debb6 100644 (file)
--- 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 7c6ed445f14381d1f824d7ea24b4302d430ab32c..800efb9b95067d948d0c757d0ab8c80a3ab48701 100644 (file)
--- 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 ad16de11dd8d83b6ce0428de85a143454cae5ff1..31c04bac6c11f894cab877b7505abcd366569c2c 100644 (file)
--- 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 687dec4ede3e28766166645529c7e9fa2863d832..cd421138fc92c0494544c3237c6985db9d0217bb 100644 (file)
--- 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 ef761011e6651d9c822cbcb9d4d7f52ea951c43f..7dce38ed1432fd8c8b69e743a65a4654e37a8afa 100644 (file)
--- 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 8a9c9cd1649eaf4a70a90d97fb43fb3f0e147d6e..830a2cfabec12fcad79d75d37b5fd22fd00f6ade 100644 (file)
--- 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 9b2aac3f150efccf3ab2aac8cd2c486945b09122..90977bff4dc326fa6efecdfb2b462adb320841b5 100644 (file)
--- 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 54490f2f929ab8543c37157b8f902f81a97b6950..3f85736b35096074e7e54cf186dbd1b849b87c5d 100644 (file)
--- 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 0c1e07f9f459d7aea4a77eb8fcc0436fd706bc04..be214e038d9862c739286c5092ea6081f646a3ee 100644 (file)
--- 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 3116545be413f92f5ab801bffe61f2cd50605f9c..4b966e235d507fb3324dfef83744ed9be2b1aaf5 100644 (file)
--- 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 9df75a6cf10751f1bfc3405b831d6d4728a14973..16218c92d63cd413e5eedb480ebc2bbddf268300 100644 (file)
--- 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 af9bef0e4ac7c0a73b5699b333f727b340983948..73935dede23c9837a0a4748c7b2eb9ce6b37479b 100644 (file)
--- 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 6c22d03b6133b43f7633890803a4b7dc30ac791a..cc6d5ae17079286faeaad09366ff4becd3b1888b 100644 (file)
--- 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 a5f7303d697bbb299667a464908e1de430d9094d..3b092df2dfe91a62070763f07429ac00dbf0b98f 100644 (file)
--- 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 372efbe94cf721b0a340371fe2c510406ec15ddc..58df8c1451751968b6d18785c463b708379cff9b 100644 (file)
--- 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 50fec06251d9b26ec190423671d26a6a5b9d10af..5d6dcb6a9255e09e695e369748fbb27432cff0f7 100644 (file)
--- 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 12963bf5fe222a550b38faa90eeed397c125028a..4cdcb44ca41263462c7eb9c07dce5a82e28578b6 100644 (file)
--- 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,