[svn-commits] rmudgett: branch dvossel/generic_aoc r259088 - /team/dvossel/generic_aoc/chan...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Apr 26 16:30:27 CDT 2010
Author: rmudgett
Date: Mon Apr 26 16:30:22 2010
New Revision: 259088
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259088
Log:
Cosmetic changes.
Modified:
team/dvossel/generic_aoc/channels/sig_pri.c
team/dvossel/generic_aoc/channels/sig_pri.h
Modified: team/dvossel/generic_aoc/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/channels/sig_pri.c?view=diff&rev=259088&r1=259087&r2=259088
==============================================================================
--- team/dvossel/generic_aoc/channels/sig_pri.c (original)
+++ team/dvossel/generic_aoc/channels/sig_pri.c Mon Apr 26 16:30:22 2010
@@ -2031,7 +2031,7 @@
return PRI_AOC_MULTIPLIER_THOUSAND;
default:
return PRI_AOC_MULTIPLIER_ONE;
- };
+ }
}
#endif /* defined(HAVE_PRI_AOC_EVENTS) */
@@ -2062,14 +2062,14 @@
return AST_AOC_MULT_THOUSAND;
default:
return AST_AOC_MULT_ONE;
- };
+ }
}
#endif /* defined(HAVE_PRI_AOC_EVENTS) */
#if defined(HAVE_PRI_AOC_EVENTS)
/*!
* \internal
- * \brief Convert ast_aoc_time_scale representation to PRI_AOC_TIME_SCALE
+ * \brief Convert ast_aoc_time_scale representation to PRI_AOC_TIME_SCALE
* \since 1.8
*
* \param value Value to convert to ast representation
@@ -2098,7 +2098,6 @@
}
#endif /* defined(HAVE_PRI_AOC_EVENTS) */
-
#if defined(HAVE_PRI_AOC_EVENTS)
/*!
* \internal
@@ -2493,7 +2492,8 @@
case PRI_AOC_E_BILLING_ID_NOT_AVAILABLE:
default:
ast_aoc_set_billing_id(decoded, AST_AOC_BILLING_NA);
- };
+ break;
+ }
switch (aoc_e->charge) {
case PRI_AOC_DE_CHARGE_CURRENCY:
@@ -2626,7 +2626,6 @@
}
#endif /* defined(HAVE_PRI_AOC_EVENTS) */
-
#if defined(HAVE_PRI_AOC_EVENTS)
/*!
* \internal
@@ -2658,7 +2657,8 @@
case AST_AOC_BILLING_NA:
default:
aoc_d.billing_id = PRI_AOC_D_BILLING_ID_NOT_AVAILABLE;
- };
+ break;
+ }
switch (ast_aoc_get_charge_type(decoded)) {
case AST_AOC_CHARGE_FREE:
@@ -2702,7 +2702,8 @@
case AST_AOC_CHARGE_NA:
default:
aoc_d.charge = PRI_AOC_DE_CHARGE_NOT_AVAILABLE;
- };
+ break;
+ }
pri_aoc_d_send(pvt->pri->pri, pvt->call, &aoc_d);
}
@@ -2774,7 +2775,8 @@
case AST_AOC_BILLING_NA:
default:
aoc_e->billing_id = PRI_AOC_E_BILLING_ID_NOT_AVAILABLE;
- };
+ break;
+ }
switch (ast_aoc_get_charge_type(decoded)) {
case AST_AOC_CHARGE_FREE:
@@ -2816,10 +2818,10 @@
case AST_AOC_CHARGE_NA:
default:
aoc_e->charge = PRI_AOC_DE_CHARGE_NOT_AVAILABLE;
- };
+ break;
+ }
}
#endif /* defined(HAVE_PRI_AOC_EVENTS) */
-
#if defined(HAVE_PRI_AOC_EVENTS)
/*!
@@ -2870,8 +2872,7 @@
ast_aoc_destroy_decoded(decoded);
ast_aoc_destroy_encoded(encoded);
}
-#endif
-
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
/*!
* \internal
@@ -3103,7 +3104,6 @@
}
}
-
#if defined(HAVE_PRI_AOC_EVENTS)
/*!
* \internal
@@ -3140,7 +3140,6 @@
return 0;
}
#endif /* defined(HAVE_PRI_AOC_EVENTS) */
-
/*!
* \internal
@@ -4721,7 +4720,7 @@
}
#else
ast_softhangup_nolock(pri->pvts[chanpos]->owner, AST_SOFTHANGUP_DEV);
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
}
}
ast_verb(3, "Channel %d/%d, span %d got hangup, cause %d\n",
@@ -4841,7 +4840,7 @@
}
#else
ast_softhangup_nolock(pri->pvts[chanpos]->owner, AST_SOFTHANGUP_DEV);
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
}
ast_verb(3, "Channel %d/%d, span %d got hangup request, cause %d\n",
PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span, e->hangup.cause);
@@ -5141,7 +5140,7 @@
if (p->holding_aoce) {
pri_aoc_e_send(p->pri->pri, p->call, &p->aoc_e);
}
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
pri_hangup(p->pri->pri, p->call, -1);
p->call = NULL;
} else {
@@ -5163,7 +5162,7 @@
if (p->holding_aoce) {
pri_aoc_e_send(p->pri->pri, p->call, &p->aoc_e);
}
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
pri_hangup(p->pri->pri, p->call, icause);
}
@@ -5180,7 +5179,7 @@
p->aoc_s_request_invoke_id_valid = 0;
p->holding_aoce = 0;
p->waiting_for_aoce = 0;
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
ast->tech_pvt = NULL;
return res;
@@ -5490,7 +5489,7 @@
pri_sr_set_aoc_charging_request(sr, PRI_AOC_REQUEST_E);
}
}
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
#if defined(HAVE_PRI_SETUP_KEYPAD)
if (ast_test_flag(&opts, OPT_KEYPAD)
@@ -5854,9 +5853,10 @@
if (ast_aoc_get_termination_request(decoded)) {
pri_hangup(p->pri->pri, p->call, -1);
}
+ break;
default:
break;
- };
+ }
pri_rel(p->pri);
}
ast_aoc_destroy_decoded(decoded);
@@ -5881,7 +5881,7 @@
pri_aoc_s_request_response_send(p->pri->pri, p->call, p->aoc_s_request_invoke_id, NULL);
p->aoc_s_request_invoke_id_valid = 0;
}
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
p->proceeding = 1;
sig_pri_set_dialing(p, 0);
res = pri_answer(p->pri->pri, p->call, 0, !p->digital);
Modified: team/dvossel/generic_aoc/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/generic_aoc/channels/sig_pri.h?view=diff&rev=259088&r1=259087&r2=259088
==============================================================================
--- team/dvossel/generic_aoc/channels/sig_pri.h (original)
+++ team/dvossel/generic_aoc/channels/sig_pri.h Mon Apr 26 16:30:22 2010
@@ -205,7 +205,7 @@
unsigned int aoc_s_request_invoke_id_valid:1; /*!< This is set when the AOC-S invoke id is present */
unsigned int waiting_for_aoce:1; /*!< Delaying hangup for AOC-E msg. If this is set and AOC-E is recieved, continue with hangup before timeout period. */
unsigned int holding_aoce:1; /*!< received AOC-E msg from asterisk. holding for disconnect/release */
-#endif
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
unsigned int inalarm:1;
unsigned int alerting:1; /*!< TRUE if channel is alerting/ringing */
unsigned int alreadyhungup:1; /*!< TRUE if the call has already gone/hungup */
@@ -261,7 +261,7 @@
#if defined(HAVE_PRI_AOC_EVENTS)
int aoc_passthrough_flag; /*!< Represents what AOC messages (S,D,E) are allowed to pass-through */
int aoce_delayhangup:1; /*!< defines whether the aoce_delayhangup option is enabled or not */
-#endif /* defined(HAVE_PRI_AOC_EVENTS) */
+#endif /* defined(HAVE_PRI_AOC_EVENTS) */
#if defined(HAVE_PRI_SERVICE_MESSAGES)
unsigned int enable_service_message_support:1; /*!< enable SERVICE message support */
More information about the svn-commits
mailing list