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.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285531 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index 172407b80305050b4989d67ce3a9332f9b6fe2a5..21dc60611b2b7eb92fdc75c7eb4dee183c475e67 100644 (file)
--- a/include/asterisk/astobj2.h
+++ b/include/asterisk/astobj2.h
@@ -583,7 +583,7 @@ Operations on container include:
 
            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 @@ void *__ao2_find(struct ao2_container *c, void *arg, enum search_flags flags);
  *
  *  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);
  *  }

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index a54becc4bef6f9f02b2266ae2ec72440cc0b6ecf..e4ea1647948c03eb9ef15553f7c360cf5cc0d4f7 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1120,7 +1120,7 @@ static void moh_rescan_files(void) {
 
        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);
        }