Formatting changes - Removing some red white space and adding some curly brackets.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/11.2
Olle Johansson 14 years ago
parent 64cb39333e
commit 82e1dda364

@ -451,8 +451,9 @@ static int local_answer(struct ast_channel *ast)
int isoutbound; int isoutbound;
int res = -1; int res = -1;
if (!p) if (!p) {
return -1; return -1;
}
ao2_lock(p); ao2_lock(p);
ao2_ref(p, 1); ao2_ref(p, 1);
@ -619,8 +620,9 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
{ {
struct local_pvt *p = newchan->tech_pvt; struct local_pvt *p = newchan->tech_pvt;
if (!p) if (!p) {
return -1; return -1;
}
ao2_lock(p); ao2_lock(p);
@ -629,10 +631,11 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
ao2_unlock(p); ao2_unlock(p);
return -1; return -1;
} }
if (p->owner == oldchan) if (p->owner == oldchan) {
p->owner = newchan; p->owner = newchan;
else } else {
p->chan = newchan; p->chan = newchan;
}
/* Do not let a masquerade cause a Local channel to be bridged to itself! */ /* Do not let a masquerade cause a Local channel to be bridged to itself! */
if (!ast_check_hangup(newchan) && ((p->owner && p->owner->_bridge == p->chan) || (p->chan && p->chan->_bridge == p->owner))) { if (!ast_check_hangup(newchan) && ((p->owner && p->owner->_bridge == p->chan) || (p->chan && p->chan->_bridge == p->owner))) {
@ -653,8 +656,9 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da
struct ast_frame f = { AST_FRAME_CONTROL, }; struct ast_frame f = { AST_FRAME_CONTROL, };
int isoutbound; int isoutbound;
if (!p) if (!p) {
return -1; return -1;
}
ao2_ref(p, 1); /* ref for local_queue_frame */ ao2_ref(p, 1); /* ref for local_queue_frame */
@ -804,7 +808,7 @@ static int local_sendhtml(struct ast_channel *ast, int subclass, const char *dat
} }
/*! \brief Initiate new call, part of PBX interface /*! \brief Initiate new call, part of PBX interface
* dest is the dial string */ * dest is the dial string */
static int local_call(struct ast_channel *ast, char *dest, int timeout) static int local_call(struct ast_channel *ast, char *dest, int timeout)
{ {
struct local_pvt *p = ast->tech_pvt; struct local_pvt *p = ast->tech_pvt;
@ -1218,8 +1222,9 @@ static char *locals_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
return NULL; return NULL;
} }
if (a->argc != 3) if (a->argc != 3) {
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
}
if (ao2_container_count(locals) == 0) { if (ao2_container_count(locals) == 0) {
ast_cli(a->fd, "No local channels in use\n"); ast_cli(a->fd, "No local channels in use\n");

Loading…
Cancel
Save