[asterisk-commits] mmichelson: branch group/CCSS r238357 - in /team/group/CCSS: include/asterisk...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jan  7 11:15:50 2010
New Revision: 238357

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238357
Log:
Return void on the unregister.


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=238357&r1=238356&r2=238357
==============================================================================
--- team/group/CCSS/include/asterisk/ccss.h (original)
+++ team/group/CCSS/include/asterisk/ccss.h Thu Jan  7 11:15:50 2010
@@ -371,7 +371,7 @@
  * \retval 0 Successfully unregistered
  * \retval -1 Failure to unregister
  */
-int ast_cc_monitor_unregister(const struct ast_cc_monitor_callbacks *callbacks);
+void ast_cc_monitor_unregister(const struct ast_cc_monitor_callbacks *callbacks);
 
 struct ast_cc_agent_callbacks;
 
@@ -402,7 +402,7 @@
  * \retval 0 Successfully unregistered
  * \retval -1 Failure to unregister
  */
-int ast_cc_agent_unregister(const struct ast_cc_agent_callbacks *callbacks);
+void ast_cc_agent_unregister(const struct ast_cc_agent_callbacks *callbacks);
 
 /* END AGENT/MONITOR REGISTRATION API */
 

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=238357&r1=238356&r2=238357
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Thu Jan  7 11:15:50 2010
@@ -725,21 +725,18 @@
 	return callbacks;
 }
 
-int ast_cc_monitor_unregister(const struct ast_cc_monitor_callbacks *callbacks)
+void ast_cc_monitor_unregister(const struct ast_cc_monitor_callbacks *callbacks)
 {
 	struct cc_monitor_backend *backend;
-	int retval = -1;
 	AST_RWLIST_WRLOCK(&cc_monitor_backends);
 	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&cc_monitor_backends, backend, next) {
 		if (backend->callbacks == callbacks) {
 			AST_RWLIST_REMOVE_CURRENT(next);
-			retval = 0;
 			break;
 		}
 	}
 	AST_RWLIST_TRAVERSE_SAFE_END;
 	AST_RWLIST_UNLOCK(&cc_monitor_backends);
-	return retval;
 }
 
 struct cc_agent_backend {
@@ -764,21 +761,18 @@
 	return 0;
 }
 
-int ast_cc_agent_unregister(const struct ast_cc_agent_callbacks *callbacks)
+void ast_cc_agent_unregister(const struct ast_cc_agent_callbacks *callbacks)
 {
 	struct cc_agent_backend *backend;
-	int retval = -1;
 	AST_RWLIST_WRLOCK(&cc_agent_backends);
 	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&cc_agent_backends, backend, next) {
 		if (backend->callbacks == callbacks) {
 			AST_RWLIST_REMOVE_CURRENT(next);
-			retval = 0;
 			break;
 		}
 	}
 	AST_RWLIST_TRAVERSE_SAFE_END;
 	AST_RWLIST_UNLOCK(&cc_agent_backends);
-	return retval;
 }
 
 static const struct ast_cc_agent_callbacks *find_agent_callbacks(struct ast_channel *chan)