realtime compiles but doesn't link even nearly

diff --git a/hostside/cmdinput.c b/hostside/cmdinput.c
index 3c93b62a31222feb7e2754ed22d40b3e19e2959d..51cec7925b5362d936082b472bf60279e1b007b6 100644 (file)
--- a/hostside/cmdinput.c
+++ b/hostside/cmdinput.c
@@ -24,9 +24,9 @@ static void *cmdi_iferr(oop_source *evts, oop_read *cl_read,
   return OOP_CONTINUE;
 }
 
-static void *client_ifok(oop_source *evts, oop_read *cl_read,
-                        oop_rd_event evt, const char *errmsg, int errnoval,
-                        const char *data, size_t recsz, void *cmdi_v) {
+static void *cmdi_ifok(oop_source *evts, oop_read *cl_read,
+                      oop_rd_event evt, const char *errmsg, int errnoval,
+                      const char *data, size_t recsz, void *cmdi_v) {
   CommandInput *cmdi= cmdi_v;
   ParseState ps;
 
@@ -36,7 +36,7 @@ static void *client_ifok(oop_source *evts, oop_read *cl_read,
   }
   
   if (evt != OOP_RD_OK)
-    return client_iferr(evts,cl_read,evt,errmsg,errnoval,data,recsz,cl_v);
+    return cmdi_iferr(evts,cl_read,evt,errmsg,errnoval,data,recsz,cmdi_v);
 
   ps.cl= 0;
   ps.remain= data;
@@ -45,14 +45,16 @@ static void *client_ifok(oop_source *evts, oop_read *cl_read,
 }
 
 void cmdin_new(CommandInput *cmdi, int readfd) {
+  int r;
+  
   obc_init(&cmdi->out);
 
   events->on_fd(events, readfd, OOP_EXCEPTION, cmdi_exception, cmdi);
 
-  cmdi->rd= oop_rd_new_fd(events, fd, 0,0);
+  cmdi->rd= oop_rd_new_fd(events, readfd, 0,0);
   if (!cmdi->rd) diee("oop_rd_new_fd");
-  r= oop_rd_read(cl->rd, OOP_RD_STYLE_GETLINE, 1024,
-                client_ifok, cmdi,
-                client_iferr, cmdi);
+  r= oop_rd_read(cmdi->rd, OOP_RD_STYLE_GETLINE, 1024,
+                cmdi_ifok, cmdi,
+                cmdi_iferr, cmdi);
   if (r) diee("oop_rd_read");  
 }