more simplifications - use a local variable c instead of o->chan,

use S_OR as appropriate.

Still need to fix the indentation of some blocks.



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