<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17382">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps: Fix for Doxygen.<br><br>ASTERISK-29740<br><br>Change-Id: Icb6fbcfea0a5f1c82caa5001902b6a786adbf307<br>---<br>M apps/app_agent_pool.c<br>M apps/app_alarmreceiver.c<br>M apps/app_bridgewait.c<br>M apps/app_chanspy.c<br>M apps/app_confbridge.c<br>M apps/app_dial.c<br>M apps/app_jack.c<br>M apps/app_meetme.c<br>M apps/app_minivm.c<br>M apps/app_mixmonitor.c<br>M apps/app_page.c<br>M apps/app_queue.c<br>M apps/app_voicemail.c<br>M apps/confbridge/conf_state.c<br>M apps/confbridge/include/confbridge.h<br>15 files changed, 67 insertions(+), 117 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_agent_pool.c b/apps/app_agent_pool.c</span><br><span>index e0df4a4..91dfe9f 100644</span><br><span>--- a/apps/app_agent_pool.c</span><br><span>+++ b/apps/app_agent_pool.c</span><br><span>@@ -24,8 +24,14 @@</span><br><span> *</span><br><span> * See Also:</span><br><span> * \arg \ref AstCREDITS</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref Config_agent</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref agents.conf "Config_agent"</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \page agents.conf agents.conf</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbinclude agents.conf.sample</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*** MODULEINFO</span><br><span> <support_level>core</support_level></span><br><span> ***/</span><br><span>@@ -646,8 +652,6 @@</span><br><span> * \brief Lock the agent.</span><br><span> *</span><br><span> * \param agent Agent to lock</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> #define agent_lock(agent) _agent_lock(agent, __FILE__, __PRETTY_FUNCTION__, __LINE__, #agent)</span><br><span> static inline void _agent_lock(struct agent_pvt *agent, const char *file, const char *function, int line, const char *var)</span><br><span>@@ -659,8 +663,6 @@</span><br><span> * \brief Unlock the agent.</span><br><span> *</span><br><span> * \param agent Agent to unlock</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> #define agent_unlock(agent) _agent_unlock(agent, __FILE__, __PRETTY_FUNCTION__, __LINE__, #agent)</span><br><span> static inline void _agent_unlock(struct agent_pvt *agent, const char *file, const char *function, int line, const char *var)</span><br><span>@@ -678,8 +680,6 @@</span><br><span> * \note Assumes the agent lock is already obtained.</span><br><span> *</span><br><span> * \note Defined locking order is channel lock then agent lock.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static struct ast_channel *agent_lock_logged(struct agent_pvt *agent)</span><br><span> {</span><br><span>@@ -744,8 +744,6 @@</span><br><span> * \since 12.0.0</span><br><span> *</span><br><span> * \param agent_id Which agent needs the device state updated.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void agent_devstate_changed(const char *agent_id)</span><br><span> {</span><br><span>@@ -1005,8 +1003,6 @@</span><br><span> * \param payload_size Size of the payload if payload is non-NULL. A number otherwise.</span><br><span> *</span><br><span> * \note The payload MUST NOT have any resources that need to be freed.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void clear_agent_status(struct ast_bridge_channel *bridge_channel, const void *payload, size_t payload_size)</span><br><span> {</span><br><span>@@ -1022,8 +1018,6 @@</span><br><span> * \param agent Which agent is connecting to the caller.</span><br><span> *</span><br><span> * \note The agent is locked on entry and not locked on exit.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void agent_connect_caller(struct ast_bridge_channel *bridge_channel, struct agent_pvt *agent)</span><br><span> {</span><br><span>@@ -1357,8 +1351,6 @@</span><br><span> * bridge_channel->bridge_pvt.</span><br><span> *</span><br><span> * \note On entry, self is already locked.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void bridge_agent_hold_pull(struct ast_bridge *self, struct ast_bridge_channel *bridge_channel)</span><br><span> {</span><br><span>@@ -1376,8 +1368,6 @@</span><br><span> * references to the bridge so it can be destroyed.</span><br><span> *</span><br><span> * \note On entry, self must NOT be locked.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void bridge_agent_hold_dissolving(struct ast_bridge *self)</span><br><span> {</span><br><span>@@ -1469,8 +1459,6 @@</span><br><span> * \param agent Which agent logging out.</span><br><span> *</span><br><span> * \note On entry agent is already locked. On exit it is no longer locked.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void agent_logout(struct agent_pvt *agent)</span><br><span> {</span><br><span>@@ -1508,8 +1496,6 @@</span><br><span> *</span><br><span> * \param agent Which agent.</span><br><span> * \param logged The logged in channel.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void agent_run(struct agent_pvt *agent, struct ast_channel *logged)</span><br><span> {</span><br><span>@@ -2028,8 +2014,6 @@</span><br><span> *</span><br><span> * \param agent What to setup channel config values on.</span><br><span> * \param chan Channel logging in as an agent.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void agent_login_channel_config(struct agent_pvt *agent, struct ast_channel *chan)</span><br><span> {</span><br><span>diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c</span><br><span>index 3577360..c3d7044 100644</span><br><span>--- a/apps/app_alarmreceiver.c</span><br><span>+++ b/apps/app_alarmreceiver.c</span><br><span>@@ -203,7 +203,6 @@</span><br><span> * family, then create it and set its value to 1.</span><br><span> *</span><br><span> * \param key A database key to increment</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void database_increment(char *key)</span><br><span> {</span><br><span>diff --git a/apps/app_bridgewait.c b/apps/app_bridgewait.c</span><br><span>index b17cddf..9326ed1 100644</span><br><span>--- a/apps/app_bridgewait.c</span><br><span>+++ b/apps/app_bridgewait.c</span><br><span>@@ -391,17 +391,6 @@</span><br><span> ao2_cleanup(wrapper);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*!</span><br><span style="color: hsl(0, 100%, 40%);">- * \internal</span><br><span style="color: hsl(0, 100%, 40%);">- * \since 12.0.0</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Application callback for the bridgewait application</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param chan channel running the application</span><br><span style="color: hsl(0, 100%, 40%);">- * \param data Arguments to the application</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval 0 Ran successfully and the call didn't hang up</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval -1 Failed or the call was hung up by the time the channel exited the holding bridge</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span> static enum wait_bridge_roles validate_role(const char *role)</span><br><span> {</span><br><span> if (!strcmp(role, "participant")) {</span><br><span>@@ -413,6 +402,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \internal</span><br><span style="color: hsl(120, 100%, 40%);">+ * \since 12.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Application callback for the bridgewait application</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param chan channel running the application</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param data Arguments to the application</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 Ran successfully and the call didn't hang up</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval -1 Failed or the call was hung up by the time the channel exited the holding bridge</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> static int bridgewait_exec(struct ast_channel *chan, const char *data)</span><br><span> {</span><br><span> char *bridge_name = DEFAULT_BRIDGE_NAME;</span><br><span>diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c</span><br><span>index c3a3f4d..2d720ee 100644</span><br><span>--- a/apps/app_chanspy.c</span><br><span>+++ b/apps/app_chanspy.c</span><br><span>@@ -559,7 +559,7 @@</span><br><span> * \brief Publish the chanspy message over Stasis-Core</span><br><span> * \param spyer The channel doing the spying</span><br><span> * \param spyee Who is being spied upon</span><br><span style="color: hsl(0, 100%, 40%);">- * \start start If non-zero, the spying is starting. Otherwise, the spyer is</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param start If non-zero, the spying is starting. Otherwise, the spyer is</span><br><span> * finishing</span><br><span> */</span><br><span> static void publish_chanspy_message(struct ast_channel *spyer,</span><br><span>diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c</span><br><span>index 3cec181..d16fd43 100644</span><br><span>--- a/apps/app_confbridge.c</span><br><span>+++ b/apps/app_confbridge.c</span><br><span>@@ -797,8 +797,8 @@</span><br><span> *</span><br><span> * \note Must be called with the conference locked</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval 1, conference is recording.</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval 0, conference is NOT recording.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 1 conference is recording.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 conference is NOT recording.</span><br><span> */</span><br><span> static int conf_is_recording(struct confbridge_conference *conference)</span><br><span> {</span><br><span>@@ -980,7 +980,8 @@</span><br><span> * \param bridge_channel The bridged channel involved</span><br><span> *</span><br><span> * \note if caller is NULL, the announcment will be sent to all participants in the conference.</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Returns 0 on success, -1 if the user hung up</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 on success.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval -1 if the user hung up.</span><br><span> */</span><br><span> static int announce_user_count(struct confbridge_conference *conference, struct confbridge_user *user,</span><br><span> struct ast_bridge_channel *bridge_channel)</span><br><span>@@ -1030,7 +1031,9 @@</span><br><span> * \param user User to play audio prompt to</span><br><span> * \param filename Prompt to play</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Returns 0 on success, -1 if the user hung up</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 on success.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval -1 if the user hung up.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * \note Generally this should be called when the conference is unlocked to avoid blocking</span><br><span> * the entire conference while the sound is played. But don't unlock the conference bridge</span><br><span> * in the middle of a state transition.</span><br><span>@@ -1167,8 +1170,6 @@</span><br><span> * \brief Destroy a conference bridge</span><br><span> *</span><br><span> * \param obj The conference bridge object</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Returns nothing</span><br><span> */</span><br><span> static void destroy_conference_bridge(void *obj)</span><br><span> {</span><br><span>@@ -1389,8 +1390,6 @@</span><br><span> * \brief Unsuspend MOH for the conference user.</span><br><span> *</span><br><span> * \param user Conference user to unsuspend MOH on.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void conf_moh_unsuspend(struct confbridge_user *user)</span><br><span> {</span><br><span>@@ -1406,8 +1405,6 @@</span><br><span> * \brief Suspend MOH for the conference user.</span><br><span> *</span><br><span> * \param user Conference user to suspend MOH on.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void conf_moh_suspend(struct confbridge_user *user)</span><br><span> {</span><br><span>@@ -4355,8 +4352,6 @@</span><br><span> * \since 12.0.0</span><br><span> *</span><br><span> * \param tech What to unregister.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void unregister_channel_tech(struct ast_channel_tech *tech)</span><br><span> {</span><br><span>diff --git a/apps/app_dial.c b/apps/app_dial.c</span><br><span>index da2253a..1f3cb8b 100644</span><br><span>--- a/apps/app_dial.c</span><br><span>+++ b/apps/app_dial.c</span><br><span>@@ -1167,8 +1167,6 @@</span><br><span> * \param chan Channel to get connected line updated.</span><br><span> * \param peer Channel providing connected line information.</span><br><span> * \param is_caller Non-zero if chan is the calling channel.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void update_connected_line_from_peer(struct ast_channel *chan, struct ast_channel *peer, int is_caller)</span><br><span> {</span><br><span>@@ -2210,8 +2208,6 @@</span><br><span> * \param peer Peer channel for bridge.</span><br><span> * \param opts Dialing option flags.</span><br><span> * \param opt_args Dialing option argument strings.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void setup_peer_after_bridge_goto(struct ast_channel *chan, struct ast_channel *peer, struct ast_flags64 *opts, char *opt_args[])</span><br><span> {</span><br><span>diff --git a/apps/app_jack.c b/apps/app_jack.c</span><br><span>index 1609972..1690521 100644</span><br><span>--- a/apps/app_jack.c</span><br><span>+++ b/apps/app_jack.c</span><br><span>@@ -615,8 +615,6 @@</span><br><span> * Read data from the input ringbuffer, which is the properly resampled audio</span><br><span> * that was read from the jack input port. Write it to the channel in 20 ms frames,</span><br><span> * or fill up an output frame instead if one is provided.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing.</span><br><span> */</span><br><span> static void handle_jack_audio(struct ast_channel *chan, struct jack_data *jack_data,</span><br><span> struct ast_frame *out_frame)</span><br><span>diff --git a/apps/app_meetme.c b/apps/app_meetme.c</span><br><span>index daafd2f..99a824d 100644</span><br><span>--- a/apps/app_meetme.c</span><br><span>+++ b/apps/app_meetme.c</span><br><span>@@ -1336,7 +1336,7 @@</span><br><span> * \brief Generate a stasis message associated with a meetme event</span><br><span> * \since 12.0.0</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param meetme_confere The conference responsible for generating this message</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param meetme_conference The conference responsible for generating this message</span><br><span> * \param chan The channel involved in the message (NULL allowed)</span><br><span> * \param user The conference user involved in the message (NULL allowed)</span><br><span> * \param message_type the type the stasis message being generated</span><br><span>@@ -2963,7 +2963,8 @@</span><br><span> * \param confflags flags used by conf for various options</span><br><span> * \param chan ast_channel belonging to the user who called the menu</span><br><span> * \param user which meetme conference user invoked the menu</span><br><span style="color: hsl(0, 100%, 40%);">- * \param recordingtmp character buffer which may hold the name of the conference recording file</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param recordingtmp, recordingtmp_size character buffer which may hold the name of the conference recording file</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param cap_slin</span><br><span> */</span><br><span> static void meetme_menu_admin_extended(enum menu_modes *menu_mode, int *dtmf,</span><br><span> struct ast_conference *conf, struct ast_flags64 *confflags, struct ast_channel *chan,</span><br><span>@@ -3150,7 +3151,8 @@</span><br><span> * \param confflags flags used by conf for various options</span><br><span> * \param chan ast_channel belonging to the user who called the menu</span><br><span> * \param user which meetme conference user invoked the menu</span><br><span style="color: hsl(0, 100%, 40%);">- * \param recordingtmp character buffer which may hold the name of the conference recording file</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param recordingtmp,recordingtmp_size character buffer which may hold the name of the conference recording file</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param cap_slin</span><br><span> */</span><br><span> static void meetme_menu(enum menu_modes *menu_mode, int *dtmf,</span><br><span> struct ast_conference *conf, struct ast_flags64 *confflags, struct ast_channel *chan,</span><br><span>diff --git a/apps/app_minivm.c b/apps/app_minivm.c</span><br><span>index 9694850..8f1064e 100644</span><br><span>--- a/apps/app_minivm.c</span><br><span>+++ b/apps/app_minivm.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> * based on the Comedian Mail voicemail system (app_voicemail.c).</span><br><span> *</span><br><span> * \par See also</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref Config_minivm_examples</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref minivm.conf "Config_minivm"</span><br><span> * \arg \ref App_minivm</span><br><span> *</span><br><span> * \ingroup applications</span><br><span>@@ -78,16 +78,16 @@</span><br><span> * - English, GB en_gb</span><br><span> *</span><br><span> * \par See also</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref Config_minivm</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref minivm.conf "Config_minivm"</span><br><span> * \arg \ref Config_minivm_examples</span><br><span> * \arg \ref Minivm_directories</span><br><span> * \arg \ref app_minivm.c</span><br><span> * \arg Comedian mail: app_voicemail.c</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref descrip_minivm_accmess</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref descrip_minivm_greet</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref descrip_minivm_record</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref descrip_minivm_delete</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref descrip_minivm_notify</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref minivm_accmess_exec</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref minivm_greet_exec</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref minivm_record_exec</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref minivm_delete_exec</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref minivm_notify_exec</span><br><span> *</span><br><span> * \arg \ref App_minivm_todo</span><br><span> */</span><br><span>@@ -113,6 +113,13 @@</span><br><span> * Back: \ref App_minivm</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \page minivm.conf minivm.conf</span><br><span style="color: hsl(120, 100%, 40%);">+ * \verbinclude minivm.conf.sample</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Back: \ref App_minivm</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! \page Config_minivm_examples Example dialplan for Mini-Voicemail</span><br><span> * \section Example dialplan scripts for Mini-Voicemail</span><br><span> * \verbinclude extensions_minivm.conf.sample</span><br><span>diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c</span><br><span>index 374c567..a0eb1db 100644</span><br><span>--- a/apps/app_mixmonitor.c</span><br><span>+++ b/apps/app_mixmonitor.c</span><br><span>@@ -631,6 +631,7 @@</span><br><span> * \brief Copies the mixmonitor to all voicemail recipients</span><br><span> * \param mixmonitor The mixmonitor that needs to forward its file to recipients</span><br><span> * \param ext Format of the file that was saved</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param filename</span><br><span> */</span><br><span> static void copy_to_voicemail(struct mixmonitor *mixmonitor, const char *ext, const char *filename)</span><br><span> {</span><br><span>diff --git a/apps/app_page.c b/apps/app_page.c</span><br><span>index 7f498ee..c4a64a2 100644</span><br><span>--- a/apps/app_page.c</span><br><span>+++ b/apps/app_page.c</span><br><span>@@ -174,8 +174,6 @@</span><br><span> *</span><br><span> * \param chan Setup bridge profile on this channel.</span><br><span> * \param options Options to setup bridge profile.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void setup_profile_bridge(struct ast_channel *chan, struct page_options *options)</span><br><span> {</span><br><span>@@ -192,8 +190,6 @@</span><br><span> *</span><br><span> * \param chan Setup user profile on this channel.</span><br><span> * \param options Options to setup paged user profile.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void setup_profile_paged(struct ast_channel *chan, struct page_options *options)</span><br><span> {</span><br><span>@@ -216,8 +212,6 @@</span><br><span> *</span><br><span> * \param chan Setup user profile on this channel.</span><br><span> * \param options Options to setup caller user profile.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void setup_profile_caller(struct ast_channel *chan, struct page_options *options)</span><br><span> {</span><br><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index 59d6f39..4f5913a 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -1661,7 +1661,7 @@</span><br><span> #define ANNOUNCEPOSITION_YES 1 /*!< We announce position */</span><br><span> #define ANNOUNCEPOSITION_NO 2 /*!< We don't announce position */</span><br><span> #define ANNOUNCEPOSITION_MORE_THAN 3 /*!< We say "Currently there are more than <limit>" */</span><br><span style="color: hsl(0, 100%, 40%);">-#define ANNOUNCEPOSITION_LIMIT 4 /*!< We not announce position more than <limit> */</span><br><span style="color: hsl(120, 100%, 40%);">+#define ANNOUNCEPOSITION_LIMIT 4 /*!< We not announce position more than \<limit\> */</span><br><span> </span><br><span> struct call_queue {</span><br><span> AST_DECLARE_STRING_FIELDS(</span><br><span>@@ -1875,6 +1875,7 @@</span><br><span> * \brief ao2_callback, Decreases queuepos of all followers with a queuepos greater than arg.</span><br><span> * \param obj the member being acted on</span><br><span> * \param arg pointer to an integer containing the position value that was removed and requires reduction for anything above</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param flag unused</span><br><span> */</span><br><span> static int queue_member_decrement_followers(void *obj, void *arg, int flag)</span><br><span> {</span><br><span>@@ -1893,6 +1894,7 @@</span><br><span> * on them. This callback should always be ran before performing mass unlinking of delmarked members from queues.</span><br><span> * \param obj member being acted on</span><br><span> * \param arg pointer to the queue members are being removed from</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param flag unused</span><br><span> */</span><br><span> static int queue_delme_members_decrement_followers(void *obj, void *arg, int flag)</span><br><span> {</span><br><span>@@ -2238,8 +2240,6 @@</span><br><span> * \param blob The information being published.</span><br><span> *</span><br><span> * \note The json blob reference is passed to this function.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void queue_publish_member_blob(struct stasis_message_type *type, struct ast_json *blob)</span><br><span> {</span><br><span>@@ -2643,7 +2643,8 @@</span><br><span> *</span><br><span> * This function recursively checks if the context child is included in the context parent.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return 1 if child is included in parent, 0 if not</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 1 if child is included in parent</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 if not</span><br><span> */</span><br><span> static int context_included(const char *parent, const char *child);</span><br><span> static int context_included(const char *parent, const char *child)</span><br><span>@@ -3428,7 +3429,7 @@</span><br><span> * \brief If removing a single member from a queue, use this function instead of ao2_unlinking.</span><br><span> * This will perform round robin queue position reordering for the remaining members.</span><br><span> * \param queue Which queue the member is being removed from</span><br><span style="color: hsl(0, 100%, 40%);">- * \param member Which member is being removed from the queue</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param mem Which member is being removed from the queue</span><br><span> */</span><br><span> static void member_remove_from_queue(struct call_queue *queue, struct member *mem)</span><br><span> {</span><br><span>@@ -4279,8 +4280,6 @@</span><br><span> * \since 1.8</span><br><span> *</span><br><span> * \param doomed callattempt structure to destroy.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void callattempt_free(struct callattempt *doomed)</span><br><span> {</span><br><span>@@ -4957,8 +4956,6 @@</span><br><span> * \param chan Channel to get connected line updated.</span><br><span> * \param peer Channel providing connected line information.</span><br><span> * \param is_caller Non-zero if chan is the calling channel.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void update_connected_line_from_peer(struct ast_channel *chan, struct ast_channel *peer, int is_caller)</span><br><span> {</span><br><span>@@ -5759,7 +5756,7 @@</span><br><span> </span><br><span> /*!</span><br><span> * \brief update the queue status</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval Always 0</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 always</span><br><span> */</span><br><span> static int update_queue(struct call_queue *q, struct member *member, int callcompletedinsl, time_t starttime)</span><br><span> {</span><br><span>@@ -6163,7 +6160,6 @@</span><br><span> *</span><br><span> * \param userdata Data pertaining to the particular call in the queue.</span><br><span> * \param sub The stasis subscription on which the message occurred.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param topic The topic for this event.</span><br><span> * \param msg The stasis message for the bridge enter event</span><br><span> */</span><br><span> static void handle_bridge_enter(void *userdata, struct stasis_subscription *sub,</span><br><span>@@ -6197,7 +6193,6 @@</span><br><span> *</span><br><span> * \param userdata Data pertaining to the particular call in the queue.</span><br><span> * \param sub The stasis subscription on which the message occurred.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param topic The topic for this event.</span><br><span> * \param msg The stasis message for the blind transfer event</span><br><span> */</span><br><span> static void handle_blind_transfer(void *userdata, struct stasis_subscription *sub,</span><br><span>@@ -6257,7 +6252,6 @@</span><br><span> *</span><br><span> * \param userdata Data pertaining to the particular call in the queue.</span><br><span> * \param sub The stasis subscription on which the message occurred.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param topic The topic for this event.</span><br><span> * \param msg The stasis message for the attended transfer event.</span><br><span> */</span><br><span> static void handle_attended_transfer(void *userdata, struct stasis_subscription *sub,</span><br><span>@@ -6332,7 +6326,6 @@</span><br><span> *</span><br><span> * \param userdata Data pertaining to the particular call in the queue.</span><br><span> * \param sub The stasis subscription on which the message occurred.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param topic The topic for this event.</span><br><span> * \param msg The stasis message for the local optimization begin event</span><br><span> */</span><br><span> static void handle_local_optimization_begin(void *userdata, struct stasis_subscription *sub,</span><br><span>@@ -6384,7 +6377,6 @@</span><br><span> *</span><br><span> * \param userdata Data pertaining to the particular call in the queue.</span><br><span> * \param sub The stasis subscription on which the message occurred.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param topic The topic for this event.</span><br><span> * \param msg The stasis message for the local optimization end event</span><br><span> */</span><br><span> static void handle_local_optimization_end(void *userdata, struct stasis_subscription *sub,</span><br><span>@@ -6449,7 +6441,6 @@</span><br><span> *</span><br><span> * \param userdata Data pertaining to the particular call in the queue.</span><br><span> * \param sub The stasis subscription on which the message occurred.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param topic The topic for this event.</span><br><span> * \param msg The stasis message for the hangup event.</span><br><span> */</span><br><span> static void handle_hangup(void *userdata, struct stasis_subscription *sub,</span><br><span>@@ -6651,8 +6642,6 @@</span><br><span> * \param peer Peer channel for bridge.</span><br><span> * \param opts Dialing option flags.</span><br><span> * \param opt_args Dialing option argument strings.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void setup_peer_after_bridge_goto(struct ast_channel *chan, struct ast_channel *peer, struct ast_flags *opts, char *opt_args[])</span><br><span> {</span><br><span>@@ -7538,8 +7527,6 @@</span><br><span> * \param paused Set to 1 if the member is being paused or 0 to unpause.</span><br><span> *</span><br><span> * \pre The q is locked on entry.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void set_queue_member_pause(struct call_queue *q, struct member *mem, const char *reason, int paused)</span><br><span> {</span><br><span>@@ -7677,8 +7664,6 @@</span><br><span> * \param ringinuse Set to 1 if the member is called when inuse.</span><br><span> *</span><br><span> * \pre The q is locked on entry.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void set_queue_member_ringinuse(struct call_queue *q, struct member *mem, int ringinuse)</span><br><span> {</span><br><span>@@ -7730,7 +7715,7 @@</span><br><span> * \param[in] queuename If specified, only act on a member if it belongs to this queue</span><br><span> * \param[in] interface Interface of queue member(s) having priority set.</span><br><span> * \param[in] property Which queue property is being set</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] penalty Value penalty is being changed to for each member</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] value Value penalty is being changed to for each member</span><br><span> */</span><br><span> static int set_member_value(const char *queuename, const char *interface, int property, int value)</span><br><span> {</span><br><span>@@ -9443,7 +9428,6 @@</span><br><span> * \param cfg The configuration which we are reading</span><br><span> * \param mask Tells us what information we need to reload</span><br><span> * \param queuename The name of the queue we are reloading information from</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval void</span><br><span> */</span><br><span> static void reload_single_queue(struct ast_config *cfg, struct ast_flags *mask, const char *queuename)</span><br><span> {</span><br><span>@@ -9657,7 +9641,7 @@</span><br><span> * \param queuename The name of the queue to reset the statistics</span><br><span> * for. If this is NULL or zero-length, then this means to reset</span><br><span> * the statistics for all queues</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval void</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 always</span><br><span> */</span><br><span> static int clear_stats(const char *queuename)</span><br><span> {</span><br><span>@@ -9933,8 +9917,8 @@</span><br><span> * list (followed immediately by a \0, not a space) since it is used for</span><br><span> * checking tab-completion and a word at the end is still being tab-completed.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Returns 1 if the word is found</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Returns 0 if the word is not found</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 1 if the word is found</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 if the word is not found</span><br><span> */</span><br><span> static int word_in_list(const char *list, const char *word) {</span><br><span> int list_len, word_len = strlen(word);</span><br><span>@@ -11549,7 +11533,7 @@</span><br><span> }</span><br><span> </span><br><span> /* \brief Find a member by looking up queuename and interface.</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Returns a member or NULL if member not found.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return member or NULL if member not found.</span><br><span> */</span><br><span> static struct member *find_member_by_queuename_and_interface(const char *queuename, const char *interface)</span><br><span> {</span><br><span>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c</span><br><span>index 94c26e1..ee7752d 100644</span><br><span>--- a/apps/app_voicemail.c</span><br><span>+++ b/apps/app_voicemail.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> * (http://www.washington.edu/imap/)</span><br><span> *</span><br><span> * \par See also</span><br><span style="color: hsl(0, 100%, 40%);">- * \arg \ref Config_vm</span><br><span style="color: hsl(120, 100%, 40%);">+ * \arg \ref voicemail.conf "Config_voicemail"</span><br><span> * \note For information about voicemail IMAP storage, https://wiki.asterisk.org/wiki/display/AST/IMAP+Voicemail+Storage</span><br><span> * \ingroup applications</span><br><span> * \todo This module requires res_adsi to load. This needs to be optional</span><br><span>@@ -1091,7 +1091,7 @@</span><br><span> * \brief Parse the given mailbox_id into mailbox and context.</span><br><span> * \since 12.0.0</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param mailbox_id The mailbox@context string to separate.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param mailbox_id The mailbox\@context string to separate.</span><br><span> * \param mailbox Where the mailbox part will start.</span><br><span> * \param context Where the context part will start. ("default" if not present)</span><br><span> *</span><br><span>@@ -2850,9 +2850,9 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span> * \brief Determines if the given folder has messages.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param mailbox The @ delimited string for user@context. If no context is found, uses 'default' for the context.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param mailbox The \@ delimited string for user\@context. If no context is found, uses 'default' for the context.</span><br><span> * \param folder the folder to look in</span><br><span> *</span><br><span> * This function is used when the mailbox is stored in an IMAP back end.</span><br><span>@@ -5947,9 +5947,9 @@</span><br><span> return nummsgs;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span> * \brief Determines if the given folder has messages.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param mailbox The @ delimited string for user@context. If no context is found, uses 'default' for the context.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param mailbox The \@ delimited string for user\@context. If no context is found, uses 'default' for the context.</span><br><span> *</span><br><span> * This function is used when the mailbox is stored in an ODBC back end.</span><br><span> * This invokes the messagecount(). Here we are interested in the presence of messages (> 0) only, not the actual count.</span><br><span>@@ -6119,7 +6119,7 @@</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span> * \brief Determines if the given folder has messages.</span><br><span> * \param mailbox The \@ delimited string for user\@context. If no context is found, uses 'default' for the context.</span><br><span> * \param folder the folder to look in</span><br><span>@@ -6152,7 +6152,7 @@</span><br><span> </span><br><span> /*!</span><br><span> * \brief Check the given mailbox's message count.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param mailbox The @ delimited string for user@context. If no context is found, uses 'default' for the context.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param mailbox The \@ delimited string for user\@context. If no context is found, uses 'default' for the context.</span><br><span> * \param urgentmsgs urgent message count.</span><br><span> * \param newmsgs new message count.</span><br><span> * \param oldmsgs old message count pointer</span><br><span>diff --git a/apps/confbridge/conf_state.c b/apps/confbridge/conf_state.c</span><br><span>index 305732f..0c05a4c 100644</span><br><span>--- a/apps/confbridge/conf_state.c</span><br><span>+++ b/apps/confbridge/conf_state.c</span><br><span>@@ -52,8 +52,6 @@</span><br><span> * \brief Mute the user and play MOH if the user requires it.</span><br><span> *</span><br><span> * \param user Conference user to mute and optionally start MOH on.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> static void conf_mute_moh_inactive_waitmarked(struct confbridge_user *user)</span><br><span> {</span><br><span>diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h</span><br><span>index 5ae49b7..95a0732 100644</span><br><span>--- a/apps/confbridge/include/confbridge.h</span><br><span>+++ b/apps/confbridge/include/confbridge.h</span><br><span>@@ -457,8 +457,6 @@</span><br><span> * \brief Update the actual mute status of the user and set it on the bridge.</span><br><span> *</span><br><span> * \param user User to update the mute status.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void conf_update_user_mute(struct confbridge_user *user);</span><br><span> </span><br><span>@@ -466,8 +464,6 @@</span><br><span> * \brief Stop MOH for the conference user.</span><br><span> *</span><br><span> * \param user Conference user to stop MOH on.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void conf_moh_stop(struct confbridge_user *user);</span><br><span> </span><br><span>@@ -475,8 +471,6 @@</span><br><span> * \brief Start MOH for the conference user.</span><br><span> *</span><br><span> * \param user Conference user to start MOH on.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \return Nothing</span><br><span> */</span><br><span> void conf_moh_start(struct confbridge_user *user);</span><br><span> </span><br><span>@@ -487,8 +481,6 @@</span><br><span> </span><br><span> /*! \brief Callback to execute any time we transition from zero to one active users</span><br><span> * \param conference The conference bridge with a single active user joined</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval 0 success</span><br><span style="color: hsl(0, 100%, 40%);">- * \retval -1 failure</span><br><span> */</span><br><span> void conf_handle_first_join(struct confbridge_conference *conference);</span><br><span> </span><br><span>@@ -702,7 +694,7 @@</span><br><span> * \since 13.22.0</span><br><span> * \since 15.5.0</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param confbridge_name The name to search for</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param conference_name The name to search for</span><br><span> *</span><br><span> * \return ConfBridge (which must be unreffed) or NULL.</span><br><span> */</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17382">change 17382</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/17382"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Icb6fbcfea0a5f1c82caa5001902b6a786adbf307 </div>
<div style="display:none"> Gerrit-Change-Number: 17382 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>