[asterisk-commits] dbailey: branch 1.4 r82913 - /branches/1.4/main/manager.c

[SVN commits to the Asterisk project]

Author: dbailey
Date: Tue Sep 18 16:49:32 2007
New Revision: 82913

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82913
Log:
Corrected patch applied in revision r82887.  

Modified:
    branches/1.4/main/manager.c

Modified: branches/1.4/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/manager.c?view=diff&rev=82913&r1=82912&r2=82913
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Tue Sep 18 16:49:32 2007
@@ -1985,16 +1985,13 @@
 			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;