[svn-commits] russell: trunk r294502 - in /trunk: ./ main/devicestate.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Nov 10 06:52:46 2010
New Revision: 294502

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294502
Log:
Merged revisions 294501 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r294501 | russell | 2010-11-10 06:46:27 -0600 (Wed, 10 Nov 2010) | 14 lines
  
  Merged revisions 294500 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r294500 | russell | 2010-11-10 06:41:41 -0600 (Wed, 10 Nov 2010) | 7 lines
    
    Improve a debug message to be more readable and consistent.
    
    (closes issue #18282)
    Reported by: klaus3000
    Patches:
          ast_devstate2str-patch.txt uploaded by klaus3000 (license 65)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/devicestate.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/devicestate.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/devicestate.c?view=diff&rev=294502&r1=294501&r2=294502
==============================================================================
--- trunk/main/devicestate.c (original)
+++ trunk/main/devicestate.c Wed Nov 10 06:52:46 2010
@@ -605,7 +605,8 @@
 
 	state = ast_devstate_aggregate_result(&agg);
 
-	ast_debug(1, "Aggregate devstate result is %d\n", state);
+	ast_debug(1, "Aggregate devstate result is '%s' for '%s'\n",
+		ast_devstate2str(state), device);
 
 	event = ast_event_get_cached(AST_EVENT_DEVICE_STATE,
 		AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, device,