[asterisk-commits] rmudgett: branch 12 r407339 - in /branches/12: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Feb  4 14:08:35 2014
New Revision: 407339

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=407339
Log:
devicestate: Make ast_devstate_changed_literal() return value and doxygen consistent.

Nothing actually cares about the value anyway.

(closes issue ASTERISK-23178)
Reported by: Jonathan Rose
........

Merged revisions 407337 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 407338 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/include/asterisk/devicestate.h
    branches/12/main/devicestate.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/include/asterisk/devicestate.h
URL: http://svnview.digium.com/svn/asterisk/branches/12/include/asterisk/devicestate.h?view=diff&rev=407339&r1=407338&r2=407339
==============================================================================
--- branches/12/include/asterisk/devicestate.h (original)
+++ branches/12/include/asterisk/devicestate.h Tue Feb  4 14:08:35 2014
@@ -130,7 +130,6 @@
  * active channels list for the device.
  *
  * \retval an AST_DEVICE_??? state
- * \retval -1 on failure
  */
 enum ast_device_state ast_device_state(const char *device);
 

Modified: branches/12/main/devicestate.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/devicestate.c?view=diff&rev=407339&r1=407338&r2=407339
==============================================================================
--- branches/12/main/devicestate.c (original)
+++ branches/12/main/devicestate.c Tue Feb  4 14:08:35 2014
@@ -463,7 +463,7 @@
 		AST_LIST_UNLOCK(&state_changes);
 	}
 
-	return 1;
+	return 0;
 }
 
 int ast_device_state_changed_literal(const char *dev)