[asterisk-commits] qwell: trunk r285531 - in /trunk: ./ include/asterisk/ res/

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Sep  8 15:43:38 2010
New Revision: 285531

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

................
  r285530 | qwell | 2010-09-08 15:43:10 -0500 (Wed, 08 Sep 2010) | 9 lines
  
  Merged revisions 285529 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r285529 | qwell | 2010-09-08 15:42:44 -0500 (Wed, 08 Sep 2010) | 1 line
    
    Follow coding guidelines in moh rescan fix.  Also fix the documentation that got me in trouble.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/astobj2.h
    trunk/res/res_musiconhold.c

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

Modified: trunk/include/asterisk/astobj2.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/astobj2.h?view=diff&rev=285531&r1=285530&r2=285531
==============================================================================
--- trunk/include/asterisk/astobj2.h (original)
+++ trunk/include/asterisk/astobj2.h Wed Sep  8 15:43:38 2010
@@ -583,7 +583,7 @@
 
 	    i = ao2_iterator_init(c, flags);
 
-	    while ( (o = ao2_iterator_next(&i)) ) {
+	    while ((o = ao2_iterator_next(&i))) {
 		... do something on o ...
 		ao2_ref(o, -1);
 	    }
@@ -1002,7 +1002,7 @@
  *
  *  i = ao2_iterator_init(c, flags);
  *
- *  while ( (o = ao2_iterator_next(&i)) ) {
+ *  while ((o = ao2_iterator_next(&i))) {
  *     ... do something on o ...
  *     ao2_ref(o, -1);
  *  }

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=285531&r1=285530&r2=285531
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Wed Sep  8 15:43:38 2010
@@ -1120,7 +1120,7 @@
 
 	i = ao2_iterator_init(mohclasses, 0);
 
-	while ( (c = ao2_iterator_next(&i)) ) {
+	while ((c = ao2_iterator_next(&i))) {
 		moh_scan_files(c);
 		ao2_ref(c, -1);
 	}