[asterisk-commits] russell: branch russell/func_devstate r54258 - in /team/russell/func_devstate...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Feb 13 15:51:32 2007
New Revision: 54258

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54258
Log:
Merged revisions 54219,54239 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r54219 | russell | 2007-02-13 14:57:41 -0600 (Tue, 13 Feb 2007) | 11 lines

Merged revisions 54218 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54218 | russell | 2007-02-13 14:56:50 -0600 (Tue, 13 Feb 2007) | 3 lines

Fix the documentation on the return values from device state provider
registration and deletion.

........

................
r54239 | russell | 2007-02-13 15:33:03 -0600 (Tue, 13 Feb 2007) | 10 lines

Merged revisions 54235 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54235 | russell | 2007-02-13 15:31:22 -0600 (Tue, 13 Feb 2007) | 2 lines

Remove a couple of leftover debug messages

........

................

Modified:
    team/russell/func_devstate/   (props changed)
    team/russell/func_devstate/channels/chan_sip.c
    team/russell/func_devstate/include/asterisk/devicestate.h

Propchange: team/russell/func_devstate/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 13 15:51:32 2007
@@ -1,1 +1,1 @@
-/trunk:1-54171
+/trunk:1-54257

Modified: team/russell/func_devstate/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/func_devstate/channels/chan_sip.c?view=diff&rev=54258&r1=54257&r2=54258
==============================================================================
--- team/russell/func_devstate/channels/chan_sip.c (original)
+++ team/russell/func_devstate/channels/chan_sip.c Tue Feb 13 15:51:32 2007
@@ -5412,14 +5412,10 @@
 	}
 	
 	if (sin.sin_addr.s_addr && !sendonly) {
-		if (option_debug > 1)
-			ast_log(LOG_DEBUG, "Setting call off HOLD! - %s\n", p->callid);
 		ast_queue_control(p->owner, AST_CONTROL_UNHOLD);
 		/* Activate a re-invite */
 		ast_queue_frame(p->owner, &ast_null_frame);
 	} else if (!sin.sin_addr.s_addr || sendonly) {
-		if (option_debug > 1)
-			ast_log(LOG_DEBUG, "Setting call on HOLD! - %s\n", p->callid);
 		ast_queue_control_data(p->owner, AST_CONTROL_HOLD, 
 				       S_OR(p->mohsuggest, NULL),
 				       !ast_strlen_zero(p->mohsuggest) ? strlen(p->mohsuggest) + 1 : 0);

Modified: team/russell/func_devstate/include/asterisk/devicestate.h
URL: http://svn.digium.com/view/asterisk/team/russell/func_devstate/include/asterisk/devicestate.h?view=diff&rev=54258&r1=54257&r2=54258
==============================================================================
--- team/russell/func_devstate/include/asterisk/devicestate.h (original)
+++ team/russell/func_devstate/include/asterisk/devicestate.h Tue Feb 13 15:51:32 2007
@@ -121,7 +121,8 @@
 /*! \brief Add device state provider 
  * \param label to use in hint, like label:object
  * \param callback Callback
- * Return -1 on failure, ID on success
+ * \retval -1 failure
+ * \retval 0 success
  */ 
 int ast_devstate_prov_add(const char *label, ast_devstate_prov_cb_type callback);