Changed some BUGBUG tags to associated JIRA issue tags.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396792 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 066d381..470b680 100644 (file)
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -1922,7 +1922,7 @@ int conf_load_config(void)
        /* This option should only be used with the CONFBRIDGE dialplan function */
        aco_option_register_custom(&cfg_info, "template", ACO_EXACT, user_types, NULL, user_template_handler, 0);
 
-/* BUGBUG need a user supplied bridge merge_priority to merge ConfBridges (default = 1, range 1-INT_MAX) */
+/* XXX ASTERISK-21271 need a user supplied bridge merge_priority to merge ConfBridges (default = 1, range 1-INT_MAX) */
        /* Bridge options */
        aco_option_register(&cfg_info, "type", ACO_EXACT, bridge_types, NULL, OPT_NOOP_T, 0, 0);
        aco_option_register(&cfg_info, "jitterbuffer", ACO_EXACT, bridge_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct bridge_profile, flags), USER_OPT_JITTERBUFFER);

diff --git a/include/asterisk/bridge_channel.h b/include/asterisk/bridge_channel.h
index 5da1653..32ef662 100644 (file)
--- a/include/asterisk/bridge_channel.h
+++ b/include/asterisk/bridge_channel.h
@@ -81,7 +81,7 @@ struct ast_bridge_tech_optimizations;
  * \brief Structure that contains information regarding a channel in a bridge
  */
 struct ast_bridge_channel {
-/* BUGBUG cond is only here because of external party suspend/unsuspend support. */
+/* XXX ASTERISK-21271 cond is only here because of external party suspend/unsuspend support. */
        /*! Condition, used if we want to wake up a thread waiting on the bridged channel */
        ast_cond_t cond;
        /*! Current bridged channel state */

diff --git a/main/bridge.c b/main/bridge.c
index fc86c31..1c25303 100644 (file)
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -1421,7 +1421,7 @@ void ast_bridge_notify_masquerade(struct ast_channel *chan)
 }
 
 /*
- * BUGBUG make ast_bridge_join() require features to be allocated just like ast_bridge_impart() and not expect the struct back.
+ * XXX ASTERISK-21271 make ast_bridge_join() require features to be allocated just like ast_bridge_impart() and not expect the struct back.
  *
  * This change is really going to break ConfBridge.  All other
  * users are easily changed.  However, it is needed so the
@@ -1449,7 +1449,7 @@ int ast_bridge_join(struct ast_bridge *bridge,
                res = -1;
                goto join_exit;
        }
-/* BUGBUG features cannot be NULL when passed in. When it is changed to allocated we can do like ast_bridge_impart() and allocate one. */
+/* XXX ASTERISK-21271 features cannot be NULL when passed in. When it is changed to allocated we can do like ast_bridge_impart() and allocate one. */
        ast_assert(features != NULL);
        if (!features) {
                ao2_ref(bridge_channel, -1);
@@ -2638,9 +2638,9 @@ void ast_bridge_merge_inhibit(struct ast_bridge *bridge, int request)
 int ast_bridge_suspend(struct ast_bridge *bridge, struct ast_channel *chan)
 {
        struct ast_bridge_channel *bridge_channel;
-/* BUGBUG the case of a disolved bridge while channel is suspended is not handled. */
-/* BUGBUG suspend/unsuspend needs to be rethought. The caller must block until it has successfully suspended the channel for temporary control. */
-/* BUGBUG external suspend/unsuspend needs to be eliminated. The channel may be playing a file at the time and stealing it then is not good. */
+/* XXX ASTERISK-21271 the case of a disolved bridge while channel is suspended is not handled. */
+/* XXX ASTERISK-21271 suspend/unsuspend needs to be rethought. The caller must block until it has successfully suspended the channel for temporary control. */
+/* XXX ASTERISK-21271 external suspend/unsuspend needs to be eliminated. The channel may be playing a file at the time and stealing it then is not good. */
 
        ast_bridge_lock(bridge);
 
@@ -2659,7 +2659,7 @@ int ast_bridge_suspend(struct ast_bridge *bridge, struct ast_channel *chan)
 int ast_bridge_unsuspend(struct ast_bridge *bridge, struct ast_channel *chan)
 {
        struct ast_bridge_channel *bridge_channel;
-/* BUGBUG the case of a disolved bridge while channel is suspended is not handled. */
+/* XXX ASTERISK-21271 the case of a disolved bridge while channel is suspended is not handled. */
 
        ast_bridge_lock(bridge);
 
@@ -3181,7 +3181,7 @@ static int bridge_dtmf_hook_sort(const void *obj_left, const void *obj_right, in
        return cmp;
 }
 
-/* BUGBUG make ast_bridge_features_init() static when make ast_bridge_join() requires features to be allocated. */
+/* XXX ASTERISK-21271 make ast_bridge_features_init() static when make ast_bridge_join() requires features to be allocated. */
 int ast_bridge_features_init(struct ast_bridge_features *features)
 {
        /* Zero out the structure */
@@ -3213,7 +3213,7 @@ int ast_bridge_features_init(struct ast_bridge_features *features)
        return 0;
 }
 
-/* BUGBUG make ast_bridge_features_cleanup() static when make ast_bridge_join() requires features to be allocated. */
+/* XXX ASTERISK-21271 make ast_bridge_features_cleanup() static when make ast_bridge_join() requires features to be allocated. */
 void ast_bridge_features_cleanup(struct ast_bridge_features *features)
 {
        struct ast_bridge_hook_timer *hook;

diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index 98e492d..bb49c0d 100644 (file)
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -1749,7 +1749,7 @@ static void bridge_channel_wait(struct ast_bridge_channel *bridge_channel)
        ast_bridge_channel_lock(bridge_channel);
        if (bridge_channel->state != BRIDGE_CHANNEL_STATE_WAIT) {
        } else if (bridge_channel->suspended) {
-/* BUGBUG the external party use of suspended will go away as will these references because this is the bridge channel thread */
+/* XXX ASTERISK-21271 the external party use of suspended will go away as will these references because this is the bridge channel thread */
                ast_debug(1, "Bridge %s: %p(%s) is going into a signal wait\n",
                        bridge_channel->bridge->uniqueid, bridge_channel,
                        ast_channel_name(bridge_channel->chan));

diff --git a/main/config_options.c b/main/config_options.c
index caa697c..2770558 100644 (file)
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -599,7 +599,7 @@ enum aco_process_status aco_process_config(struct aco_info *info, int reload)
        }
 
 /*
- * BUGBUG must fix config framework loading of multiple files.
+ * XXX ASTERISK-22009 must fix config framework loading of multiple files.
  *
  * A reload with multiple files must reload all files if any
  * file has been touched.