summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2015-01-15 17:28:51 +0000
committerRichard Mudgett <rmudgett@digium.com>2015-01-15 17:28:51 +0000
commit9b1c36d3fad968d5937fa484dfa9b60c335c6194 (patch)
treea724759ae93e5991ed0b2a00c4dd62144dc3f134
parent1e605d950bfe7c7b20fd72bdcfca41bbcbfc7470 (diff)
res_fax.c, res_fax_spandsp.c: Fix some curlies on the end of function definitions.
........ Merged revisions 430685 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--res/res_fax.c16
-rw-r--r--res/res_fax_spandsp.c16
2 files changed, 22 insertions, 10 deletions
diff --git a/res/res_fax.c b/res/res_fax.c
index 5f2798ab4..8a796ef69 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -839,6 +839,7 @@ static int update_modem_bits(enum ast_fax_modems *bits, const char *value)
}
return 0;
}
+
static char *ast_fax_caps_to_str(enum ast_fax_capabilities caps, char *buf, size_t bufsize)
{
char *out = buf;
@@ -1356,7 +1357,8 @@ static struct ast_json *generate_filenames_json(struct ast_fax_session_details *
return json_array;
}
-/* \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
@@ -3236,7 +3238,8 @@ static struct ast_frame *fax_gateway_detect_t38(struct fax_gateway *gateway, str
/*! \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) {
@@ -3270,7 +3273,8 @@ static void fax_gateway_framehook_destroy(void *data) {
*
* \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 *active;
RAII_VAR(struct ast_fax_session_details *, details, NULL, ao2_cleanup);
@@ -3575,7 +3579,8 @@ static struct fax_detect *fax_detect_new(struct ast_channel *chan, int timeout,
/*! \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);
@@ -3592,7 +3597,8 @@ static void fax_detect_framehook_destroy(void *data) {
*
* \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 b56de939f..1df2d8160 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -591,8 +591,10 @@ e_return:
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);
}
@@ -668,7 +670,8 @@ static void spandsp_v21_tone(void *data, int code, int level, int delay)
}
}
-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;
@@ -793,19 +796,22 @@ static int spandsp_fax_gw_t30_gen(struct ast_channel *chan, void *data, int len,
* \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;