[svn-commits] rmudgett: branch rmudgett/ss7_27_knk r395424 - /team/rmudgett/ss7_27_knk/chan...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jul 25 11:45:50 CDT 2013
Author: rmudgett
Date: Thu Jul 25 11:45:46 2013
New Revision: 395424
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395424
Log:
chan_dahdi: Remove trailing whitespace.
Modified:
team/rmudgett/ss7_27_knk/channels/chan_dahdi.c
Modified: team/rmudgett/ss7_27_knk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/channels/chan_dahdi.c?view=diff&rev=395424&r1=395423&r2=395424
==============================================================================
--- team/rmudgett/ss7_27_knk/channels/chan_dahdi.c (original)
+++ team/rmudgett/ss7_27_knk/channels/chan_dahdi.c Thu Jul 25 11:45:46 2013
@@ -508,7 +508,7 @@
static int dtmfcid_level = 256;
#define REPORT_CHANNEL_ALARMS 1
-#define REPORT_SPAN_ALARMS 2
+#define REPORT_SPAN_ALARMS 2
static int report_alarms = REPORT_CHANNEL_ALARMS;
#ifdef HAVE_PRI
@@ -1709,14 +1709,14 @@
#endif
/* linear_mode = 0 - turn linear mode off, >0 - turn linear mode on
-* returns the last value of the linear setting
-*/
+* returns the last value of the linear setting
+*/
static int my_set_linear_mode(void *pvt, enum analog_sub sub, int linear_mode)
{
struct dahdi_pvt *p = pvt;
int oldval;
int idx = analogsub_to_dahdisub(sub);
-
+
dahdi_setlinear(p->subs[idx].dfd, linear_mode);
oldval = p->subs[idx].linear;
p->subs[idx].linear = linear_mode ? 1 : 0;
@@ -4549,7 +4549,7 @@
float neg;
float shallow, steep;
float max = SHRT_MAX;
-
+
neg = (sample < 0 ? -1 : 1);
steep = drc*sample;
shallow = neg*(max-max/drc)+(float)sample/drc;
@@ -8272,7 +8272,7 @@
/* if the call is already accepted and we already delivered AST_CONTROL_RINGING
* now enqueue a progress frame to bridge the media up */
if (p->mfcr2_call_accepted &&
- !p->mfcr2_progress_sent &&
+ !p->mfcr2_progress_sent &&
ast_channel_state(ast) == AST_STATE_RINGING) {
ast_debug(1, "Enqueuing progress frame after R2 accept in chan %d\n", p->channel);
ast_queue_frame(p->owner, &fr);
@@ -11094,7 +11094,7 @@
pfds[count].events = POLLPRI;
pfds[count].revents = 0;
/* Message waiting or r2 channels also get watched for reading */
- if (i->cidspill || i->mwisendactive || i->mwimonitor_fsk ||
+ if (i->cidspill || i->mwisendactive || i->mwimonitor_fsk ||
(i->cid_start == CID_START_DTMF_NOALERT && (i->sig == SIG_FXSLS || i->sig == SIG_FXSGS || i->sig == SIG_FXSKS))) {
pfds[count].events |= POLLIN;
}
@@ -11247,7 +11247,7 @@
int energy;
struct timeval now;
/* State machine dtmfcid_holdoff_state allows for the line to settle
- * before checking agin for dtmf energy. Presently waits for 500 mS before checking again
+ * before checking agin for dtmf energy. Presently waits for 500 mS before checking again
*/
if (1 == i->dtmfcid_holdoff_state) {
gettimeofday(&i->dtmfcid_delay, NULL);
@@ -11265,7 +11265,7 @@
ast_mutex_unlock(&iflock);
if (dahdi_analog_lib_handles(i->sig, i->radio, i->oprmode)) {
/* just in case this event changes or somehow destroys a channel, set doomed here too */
- doomed = analog_handle_init_event(i->sig_pvt, ANALOG_EVENT_DTMFCID);
+ doomed = analog_handle_init_event(i->sig_pvt, ANALOG_EVENT_DTMFCID);
i->dtmfcid_holdoff_state = 1;
} else {
struct ast_callid *callid = NULL;
@@ -11526,9 +11526,9 @@
struct dahdi_mfcr2 *new_r2link = NULL;
struct dahdi_mfcr2 **new_r2links = NULL;
- /* Only create a new R2 link if
+ /* Only create a new R2 link if
1. This is the first link requested
- 2. Configuration changed
+ 2. Configuration changed
3. We got more channels than supported per link */
if (!r2links_count ||
memcmp(&conf->mfcr2, &r2links[r2links_count - 1]->conf, sizeof(conf->mfcr2)) ||
@@ -17051,11 +17051,11 @@
}
busy_cadence->length = count_pattern;
- if (count_pattern % 2 != 0) {
+ if (count_pattern % 2 != 0) {
/* The pattern length must be divisible by two */
ast_log(LOG_ERROR, "busypattern= expects either busypattern=tonelength,quietlength or busypattern=t1length, q1length, t2length, q2length at line %d.\n", v->lineno);
}
-
+
}
static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct ast_variable *v, int reload, int options)
@@ -17713,7 +17713,7 @@
#if defined(HAVE_PRI_SERVICE_MESSAGES)
} else if (!strcasecmp(v->name, "service_message_support")) {
/* assuming switchtype for this channel group has been configured already */
- if ((confp->pri.pri.switchtype == PRI_SWITCH_ATT4ESS
+ if ((confp->pri.pri.switchtype == PRI_SWITCH_ATT4ESS
|| confp->pri.pri.switchtype == PRI_SWITCH_LUCENT5E
|| confp->pri.pri.switchtype == PRI_SWITCH_NI2) && ast_true(v->value)) {
confp->pri.pri.enable_service_message_support = 1;
@@ -18370,7 +18370,7 @@
for (tmp = iflist, y=-1; tmp; tmp = tmp->next) {
if (!tmp->destroy && tmp->span != y) {
tmp->manages_span_alarms = 1;
- y = tmp->span;
+ y = tmp->span;
} else {
tmp->manages_span_alarms = 0;
}
@@ -18905,8 +18905,8 @@
* Module loading including tests for configuration or dependencies.
* This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
* or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
- * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
- * configuration file or other non-critical problem return
+ * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
+ * configuration file or other non-critical problem return
* AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
*/
static int load_module(void)
More information about the svn-commits
mailing list