aboutsummaryrefslogtreecommitdiffstats
path: root/main/manager.c
diff options
context:
space:
mode:
authordbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-18 21:49:32 +0000
committerdbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-18 21:49:32 +0000
commit1e7a1dd3b1ca67fe3270f78f58354e6a85b7da7a (patch)
tree7992ca3835c668aead2885ad99513640c68514a1 /main/manager.c
parentba90166b1fe753aa1da4c84ac44312707c83836e (diff)
Corrected patch applied in revision r82887.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@82913 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/main/manager.c b/main/manager.c
index 6bd4a4e15..1964bfdfd 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1985,16 +1985,13 @@ static int process_events(struct mansession *s)
if (s->fd > -1) {
if (!ret && ast_carefulwrite(s->fd, eqe->eventdata, strlen(eqe->eventdata), s->writetimeout) < 0)
ret = -1;
- } else {
- if (!s->outputstr && !(s->outputstr = ast_calloc(1, sizeof(*s->outputstr)))) {
- ast_mutex_unlock(&s->__lock);
- return;
- }
- ast_dynamic_str_append(&s->outputstr, 0, "%s", buf->str);
- }
- }
- unuse_eventqent(s->eventq);
- s->eventq = eqe;
+ } else if (!s->outputstr && !(s->outputstr = ast_calloc(1, sizeof(*s->outputstr))))
+ ret = -1;
+ else
+ ast_dynamic_str_append(&s->outputstr, 0, "%s", eqe->eventdata);
+ }
+ unuse_eventqent(s->eventq);
+ s->eventq = eqe;
}
ast_mutex_unlock(&s->__lock);
return ret;