[svn-commits] mmichelson: branch group/CCSS r247887 - in /team/group/CCSS: include/asterisk...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Feb 18 17:43:21 CST 2010
Author: mmichelson
Date: Thu Feb 18 17:43:18 2010
New Revision: 247887
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247887
Log:
Remove trailing whitespace.
Modified:
team/group/CCSS/include/asterisk/ccss.h
team/group/CCSS/main/ccss.c
Modified: team/group/CCSS/include/asterisk/ccss.h
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/include/asterisk/ccss.h?view=diff&rev=247887&r1=247886&r2=247887
==============================================================================
--- team/group/CCSS/include/asterisk/ccss.h (original)
+++ team/group/CCSS/include/asterisk/ccss.h Thu Feb 18 17:43:18 2010
@@ -548,7 +548,7 @@
* \details
* Perform whatever steps are necessary in order to request CC.
* In addition, the monitor implementation is responsible for
- * starting the available timer in this callback.
+ * starting the available timer in this callback.
*
* \retval 0 on success
* \retval -1 on failure.
Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=247887&r1=247886&r2=247887
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Thu Feb 18 17:43:18 2010
@@ -957,7 +957,7 @@
}
if (!(generic_list->sub = ast_event_subscribe(AST_EVENT_DEVICE_STATE, generic_monitor_devstate_cb,
- "Requesting CC", NULL, AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR,
+ "Requesting CC", NULL, AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR,
monitor->interface->device_name, AST_EVENT_IE_END))) {
cc_unref(generic_list, "Failed to subscribe to device state");
return NULL;
@@ -1006,7 +1006,7 @@
ast_cc_monitor_callee_available(generic_instance->core_id, "Generic monitored party has become available");
break;
}
- }
+ }
}
cc_unref(generic_list, "Kill reference of generic list in devstate taskprocessor callback");
ast_free((char *) gtcd->device_name);
@@ -1234,7 +1234,7 @@
}
}
AST_LIST_TRAVERSE_SAFE_END;
-
+
if (AST_LIST_EMPTY(&generic_list->list)) {
/* No more monitors with this device name exist. Time to unlink this
* list from the container
@@ -2175,7 +2175,7 @@
* Caller ID number
*
* When we re-call the caller, we need
- * to provide this information to
+ * to provide this information to
* ast_request_and_dial so that the
* information will be present in the
* call to the callee
@@ -2376,7 +2376,7 @@
*/
ast_setup_cc_recall_datastore(chan, agent->core_id);
ast_cc_agent_set_interfaces_chanvar(chan);
-
+
ast_copy_string(chan->exten, generic_pvt->exten, sizeof(chan->exten));
ast_copy_string(chan->context, generic_pvt->context, sizeof(chan->context));
chan->priority = 1;
@@ -2602,7 +2602,7 @@
break;
}
}
-
+
return res;
}
@@ -2614,7 +2614,7 @@
if (monitor_iter->interface->monitor_class == AST_CC_DEVICE_MONITOR) {
if (monitor_iter->callbacks->request_cc(monitor_iter, &monitor_iter->available_timer_id)) {
AST_LIST_REMOVE_CURRENT(next);
- cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
+ cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
monitor_iter->interface->device_name, 1);
cc_unref(monitor_iter, "request_cc failed. Unref list's reference to monitor");
} else {
@@ -2658,7 +2658,7 @@
if (monitor_iter->interface->monitor_class == AST_CC_DEVICE_MONITOR) {
if (monitor_iter->callbacks->unsuspend(monitor_iter)) {
AST_LIST_REMOVE_CURRENT(next);
- cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
+ cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
monitor_iter->interface->device_name, 1);
cc_unref(monitor_iter, "unsuspend failed. Unref list's reference to monitor");
}
@@ -2708,7 +2708,7 @@
if (monitor_iter->interface->monitor_class == AST_CC_DEVICE_MONITOR) {
if (monitor_iter->callbacks->suspend(monitor_iter)) {
AST_LIST_REMOVE_CURRENT(next);
- cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
+ cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
monitor_iter->interface->device_name, 1);
cc_unref(monitor_iter, "suspend failed. Unref list's reference to monitor");
}
@@ -2744,7 +2744,7 @@
if (monitor_iter->interface->monitor_class == AST_CC_DEVICE_MONITOR) {
if (monitor_iter->callbacks->cancel_available_timer(monitor_iter, &monitor_iter->available_timer_id)) {
AST_LIST_REMOVE_CURRENT(next);
- cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
+ cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
monitor_iter->interface->device_name, 1);
cc_unref(monitor_iter, "cancel_available_timer failed. Unref list's reference to monitor");
}
@@ -3153,7 +3153,7 @@
AST_LIST_UNLOCK(interface_tree);
pbx_builtin_setvar_helper(chan, "CC_INTERFACES", ast_str_buffer(str));
- ast_log_dynamic_level(cc_logger_level, "Core %d: CC_INTERFACES set to %s\n",
+ ast_log_dynamic_level(cc_logger_level, "Core %d: CC_INTERFACES set to %s\n",
core_id, ast_str_buffer(str));
cc_unref(interface_tree, "Done with monitor tree while setting CC_INTERFACES");
@@ -3173,7 +3173,7 @@
if (!str) {
return -1;
}
-
+
ast_channel_lock(chan);
if (!(recall_datastore = ast_channel_datastore_find(chan, &recall_ds_info, NULL))) {
ast_channel_unlock(chan);
@@ -3414,7 +3414,7 @@
if (monitor_iter->interface->monitor_class == AST_CC_DEVICE_MONITOR) {
if (!strcmp(monitor_iter->interface->device_name, failure_data->device_name)) {
AST_LIST_REMOVE_CURRENT(next);
- cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
+ cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
monitor_iter->interface->device_name, 1);
monitor_iter->callbacks->cancel_available_timer(monitor_iter, &monitor_iter->available_timer_id);
cc_unref(monitor_iter, "Monitor reported failure. Unref list's reference.");
@@ -3503,7 +3503,7 @@
/* If an agent is being asked to stop ringing, then he needs to be prepared if for
* whatever reason he needs to be called back again. The proper state to be in to
* detect such a circumstance is the CC_ACTIVE state.
- *
+ *
* We get to this state using the slightly unintuitive method of calling
* ast_cc_monitor_request_acked because it gets us to the proper state.
*/
@@ -3599,7 +3599,7 @@
ast_free(args);
return -1;
}
-
+
args->core_instance = core_instance;
args->devstate = devstate;
@@ -3639,7 +3639,7 @@
return 0;
}
-int ast_queue_cc_frame(struct ast_channel *chan, const char *monitor_type,
+int ast_queue_cc_frame(struct ast_channel *chan, const char *monitor_type,
const char * const dialstring, enum ast_cc_service_type service, void *private_data)
{
struct ast_frame frame = {0,};
@@ -3829,7 +3829,7 @@
AST_LIST_LOCK(core_instance->monitors);
AST_LIST_TRAVERSE(core_instance->monitors, monitor_iter, next) {
- if (!strcmp(monitor_iter->interface->device_name, device_name) &&
+ if (!strcmp(monitor_iter->interface->device_name, device_name) &&
!strcmp(monitor_iter->interface->monitor_type, monitor_type)) {
cb_data->count++;
break;
More information about the svn-commits
mailing list