Merged revisions 331265 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Tue, 9 Aug 2011 23:17:13 +0000 (23:17 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 9 Aug 2011 23:17:13 +0000 (23:17 +0000)
commitb99b1116be609fa4a614bf3ab5301fef3d74da0c
tree43e6a5dbb777a4f5bcfc064893a65da9cb161d92
parent1626b29f6faf09b4655c2695a3cf89afc0c72bda
Merged revisions 331265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331265 | rmudgett | 2011-08-09 18:12:49 -0500 (Tue, 09 Aug 2011) | 22 lines

  Merged revisions 331248 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r331248 | rmudgett | 2011-08-09 17:12:59 -0500 (Tue, 09 Aug 2011) | 15 lines

    Misc minor items found in code.

    * Add some reentrancy protection in pbx.c when creating the contexts_table
    hash table.

    * Fix inverted test in chan_sip.c conditional code.

    * Fix uninitialized variable and use of the wrong variable in chan_iax2.c.

    * Fix test of return value in app_parkandannounce.c.  Explicitly testing
    for -1 is bad if the function does not actually return that value when it
    fails.

    * Fixup some comments and add some curly braces in features.c.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_parkandannounce.c
channels/chan_iax2.c
channels/chan_sip.c
main/features.c
main/pbx.c