[haver-commits] r488 - in trunk: . clients/havercurs

[haver]

Author: bdonlan
Date: 2004-12-30 22:27:33 -0500 (Thu, 30 Dec 2004)
New Revision: 488

Modified:
   trunk/
   trunk/clients/havercurs/lineio.c
   trunk/clients/havercurs/main.c
Log:
 [EMAIL PROTECTED]:  bdonlan | 2004-12-31T03:27:19.943739Z
 Fix crash upon input; set connect delay to 15 secs



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:10241
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
   + 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:10244
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/clients/havercurs/lineio.c
===================================================================
--- trunk/clients/havercurs/lineio.c    2004-12-31 03:18:14 UTC (rev 487)
+++ trunk/clients/havercurs/lineio.c    2004-12-31 03:27:33 UTC (rev 488)
@@ -3,6 +3,8 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <assert.h>
+#include <string.h>
+#include <stdio.h>
 #include "lineio.h"
 #include "mymalloc.h"
 #include "event.h"
@@ -42,6 +44,7 @@
                        lineio_evcallback,
                        conn
                        );
+    return conn;
 }
 
 static void lineio_evcallback(int fd, int mode, void *baton) {
@@ -64,8 +67,8 @@
                                /* badness */
                                abort();
                        }
-                       assert(dlen <= conn->outbuf_used);
-                       if (conn->outbuf_used > dlen) {
+                       assert((size_t)dlen <= conn->outbuf_used);
+                       if (conn->outbuf_used > (size_t)dlen) {
                                memmove(conn->outbuf, conn->outbuf + dlen,
                                                conn->outbuf_used - dlen);
                        }

Modified: trunk/clients/havercurs/main.c
===================================================================
--- trunk/clients/havercurs/main.c      2004-12-31 03:18:14 UTC (rev 487)
+++ trunk/clients/havercurs/main.c      2004-12-31 03:27:33 UTC (rev 488)
@@ -48,7 +48,7 @@
        event_init();
        display_init(LINES - 2);
 
-    heartbeat_start(5);
+    heartbeat_start(15);
 
        refresh();