X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=blobdiff_plain;f=conn.c;h=d20b342d4d22f79df61f9916337af9140e127eff;hp=e38adb5f2bb0baae2b18a6574765138e337709ae;hb=229c6d070b1ddb2cebb0a3f12bc71713795cd627;hpb=854f19ae391120e6dd11c33c66250745b3d21aa7

diff --git a/conn.c b/conn.c
index e38adb5..d20b342 100644
--- a/conn.c
+++ b/conn.c
@@ -100,7 +100,7 @@ void vconnfail(Conn *conn, const char *fmt, va_list al) {
 
   LIST_REMOVE(conns,conn);
 
-  char *m= xvasprintf(fmt,al);
+  char *m= mvasprintf(fmt,al);
   warn("C%d (now %d) connection failed "
        "(requeueing " RCI_TRIPLE_FMT_BASE "): %s",
        conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
@@ -195,7 +195,7 @@ static int conns_max_reported, conns_idle_reported;
 
 void notice_conns_more(const char *new_kind) {
   if (conns.count > conns_max_reported) {
-    notice("up to %d connections (%s)", conns.count, new_kind);
+    notice("up to %d connection(s) (%s)", conns.count, new_kind);
     conns_max_reported= conns.count;
   }
 }
@@ -428,7 +428,7 @@ void connect_start(void) {
       default:
 	warn("connect: unexpected response to MODE STREAM: %.50s",
 	     sanitise(buf,-1));
-	exitstatus= 2;
+	exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
 	break;
       }
     }