[asterisk-commits] res fax: Fix some curlies on the end of function definitions. (asterisk[11])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Aug 26 12:55:24 CDT 2016
Anonymous Coward #1000019 has submitted this change and it was merged.
Change subject: res_fax: Fix some curlies on the end of function definitions.
......................................................................
res_fax: Fix some curlies on the end of function definitions.
Backported from v13 revision 6c426e86bd470c3a2f3b73b3a070583c92c19af4.
Change-Id: Iaa561a17c88d4383971f4b4fc8cee24318e779c4
---
M res/res_fax.c
M res/res_fax_spandsp.c
2 files changed, 22 insertions(+), 11 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Anonymous Coward #1000019: Verified
Joshua Colp: Looks good to me, approved
Corey Farrell: Looks good to me, but someone else must approve
diff --git a/res/res_fax.c b/res/res_fax.c
index 2f9d9ff..f4deca4 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -615,6 +615,7 @@
}
return 0;
}
+
static char *ast_fax_caps_to_str(enum ast_fax_capabilities caps, char *buf, size_t bufsize)
{
char *out = buf;
@@ -1097,8 +1098,8 @@
pbx_substitute_variables_helper(chan, "${CALLERID(num)}", info->cid, sizeof(info->cid));
}
-
-/* \brief Generate a string of filenames using the given prefix and separator.
+/*!
+ * \brief Generate a string of filenames using the given prefix and separator.
* \param details the fax session details
* \param prefix the prefix to each filename
* \param separator the separator between filenames
@@ -2934,7 +2935,8 @@
/*! \brief Destroy the gateway data structure when the framehook is detached
* \param data framehook data (gateway data)*/
-static void fax_gateway_framehook_destroy(void *data) {
+static void fax_gateway_framehook_destroy(void *data)
+{
struct fax_gateway *gateway = data;
if (gateway->s) {
@@ -2968,7 +2970,8 @@
*
* \return processed frame or NULL when f is NULL or a null frame
*/
-static struct ast_frame *fax_gateway_framehook(struct ast_channel *chan, struct ast_frame *f, enum ast_framehook_event event, void *data) {
+static struct ast_frame *fax_gateway_framehook(struct ast_channel *chan, struct ast_frame *f, enum ast_framehook_event event, void *data)
+{
struct fax_gateway *gateway = data;
struct ast_channel *peer, *active;
struct ast_fax_session_details *details;
@@ -3289,7 +3292,8 @@
/*! \brief Deref the faxdetect data structure when the faxdetect framehook is detached
* \param data framehook data (faxdetect data)*/
-static void fax_detect_framehook_destroy(void *data) {
+static void fax_detect_framehook_destroy(void *data)
+{
struct fax_detect *faxdetect = data;
ao2_ref(faxdetect, -1);
@@ -3306,7 +3310,8 @@
*
* \return processed frame or NULL when f is NULL or a null frame
*/
-static struct ast_frame *fax_detect_framehook(struct ast_channel *chan, struct ast_frame *f, enum ast_framehook_event event, void *data) {
+static struct ast_frame *fax_detect_framehook(struct ast_channel *chan, struct ast_frame *f, enum ast_framehook_event event, void *data)
+{
struct fax_detect *faxdetect = data;
struct ast_fax_session_details *details;
struct ast_control_t38_parameters *control_params;
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 30525ee..d8b8af1 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -587,8 +587,10 @@
return NULL;
}
-static void spandsp_v21_cleanup(struct ast_fax_session *s) {
+static void spandsp_v21_cleanup(struct ast_fax_session *s)
+{
struct spandsp_pvt *p = s->tech_pvt;
+
modem_connect_tones_rx_free(p->tone_state);
}
@@ -664,7 +666,8 @@
}
}
-static int spandsp_v21_detect(struct ast_fax_session *s, const struct ast_frame *f) {
+static int spandsp_v21_detect(struct ast_fax_session *s, const struct ast_frame *f)
+{
struct spandsp_pvt *p = s->tech_pvt;
int16_t *slndata;
g711_state_t *decoder;
@@ -788,19 +791,22 @@
* \param chan channel
* \param params generator data
* \return data to use in generator call*/
-static void *spandsp_fax_gw_gen_alloc(struct ast_channel *chan, void *params) {
+static void *spandsp_fax_gw_gen_alloc(struct ast_channel *chan, void *params)
+{
ao2_ref(params, +1);
return params;
}
-static void spandsp_fax_gw_gen_release(struct ast_channel *chan, void *data) {
+static void spandsp_fax_gw_gen_release(struct ast_channel *chan, void *data)
+{
ao2_ref(data, -1);
}
/*! \brief activate a spandsp gateway based on the information in the given fax session
* \param s fax session
* \return -1 on error 0 on sucess*/
-static int spandsp_fax_gateway_start(struct ast_fax_session *s) {
+static int spandsp_fax_gateway_start(struct ast_fax_session *s)
+{
struct spandsp_pvt *p = s->tech_pvt;
struct ast_fax_t38_parameters *t38_param;
int i;
--
To view, visit https://gerrit.asterisk.org/3698
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa561a17c88d4383971f4b4fc8cee24318e779c4
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
More information about the asterisk-commits
mailing list