kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup code. Spacing issues, nested if issues, lots of strlen used instead of ast_strlen_zero

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-09-17 14:15:11 +00:00
parent a9f5393bfe
commit 877f1f64c2
3 changed files with 130 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
manager.c
View File

@@ -814,22 +814,22 @@ static void *fast_originate(void *data)
} else {
res = ast_pbx_outgoing_exten(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->context, in->exten, in->priority, &reason, 1, !ast_strlen_zero(in->callerid) ? in->callerid : NULL, in->variable, in->account);
}
if(!res)
manager_event(EVENT_FLAG_CALL,
"OriginateSuccess",
"%s"
"Channel: %s/%s\r\n"
"Context: %s\r\n"
"Exten: %s\r\n",
in->tech, in->data, in->idtext, in->context, in->exten);
else
manager_event(EVENT_FLAG_CALL,
"OriginateFailure",
"%s"
"Channel: %s/%s\r\n"
"Context: %s\r\n"
"Exten: %s\r\n",
in->tech, in->data, in->idtext, in->context, in->exten);
if (!res)
manager_event(EVENT_FLAG_CALL,
"OriginateSuccess",
"%s"
"Channel: %s/%s\r\n"
"Context: %s\r\n"
"Exten: %s\r\n",
in->tech, in->data, in->idtext, in->context, in->exten);
else
manager_event(EVENT_FLAG_CALL,
"OriginateFailure",
"%s"
"Channel: %s/%s\r\n"
"Context: %s\r\n"
"Exten: %s\r\n",
in->tech, in->data, in->idtext, in->context, in->exten);
free(in);
return NULL;
@@ -894,15 +894,11 @@ static int action_originate(struct mansession *s, struct message *m)
}
*data = '\0';
data++;
if (ast_true(async))
{
if (ast_true(async)) {
struct fast_originate_helper *fast = malloc(sizeof(struct fast_originate_helper));
if (!fast)
{
if (!fast) {
res = -1;
}
else
{
} else {
memset(fast, 0, sizeof(struct fast_originate_helper));
if (id && !ast_strlen_zero(id))
snprintf(fast->idtext, sizeof(fast->idtext), "ActionID: %s\r\n", id);
@@ -919,12 +915,9 @@ static int action_originate(struct mansession *s, struct message *m)
fast->priority = pi;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&th, &attr, fast_originate, fast))
{
if (ast_pthread_create(&th, &attr, fast_originate, fast)) {
res = -1;
}
else
{
} else {
res = 0;
}
}