[asterisk-commits] rmudgett: branch 13 r430685 - in /branches/13/res: res_fax.c res_fax_spandsp.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jan 15 11:18:18 CST 2015
Author: rmudgett
Date: Thu Jan 15 11:18:14 2015
New Revision: 430685
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430685
Log:
res_fax.c, res_fax_spandsp.c: Fix some curlies on the end of function definitions.
Modified:
branches/13/res/res_fax.c
branches/13/res/res_fax_spandsp.c
Modified: branches/13/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_fax.c?view=diff&rev=430685&r1=430684&r2=430685
==============================================================================
--- branches/13/res/res_fax.c (original)
+++ branches/13/res/res_fax.c Thu Jan 15 11:18:14 2015
@@ -839,6 +839,7 @@
}
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 @@
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 @@
/*! \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 @@
*
* \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 @@
/*! \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 @@
*
* \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;
Modified: branches/13/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_fax_spandsp.c?view=diff&rev=430685&r1=430684&r2=430685
==============================================================================
--- branches/13/res/res_fax_spandsp.c (original)
+++ branches/13/res/res_fax_spandsp.c Thu Jan 15 11:18:14 2015
@@ -591,8 +591,10 @@
return NULL;
}
-static void spandsp_v21_cleanup(struct ast_fax_session *s) {
- struct spandsp_pvt *p = s->tech_pvt;
+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 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 @@
* \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;
More information about the asterisk-commits
mailing list