Changeset 18fdd5f9 for owl.c

Timestamp:

Oct 27, 2009, 12:41:17 AM (14 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

6fc40a7

Parents:

ffc4df6

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (10/24/09 17:31:48)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (10/27/09 00:41:17)

Message:

Switch C to the new I/O Dispatch API.

Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>

File:

• owl.c (modified) (3 diffs)

owl.c

@@ -315 +315 @@
 }
 
-void owl_process_input(owl_dispatch *d)
+void owl_process_input(const owl_io_dispatch *d, void *data)
 {
   owl_input j;
@@ -444 +444 @@
 
 /* Sends stderr (read from rfd) messages to the error console */
-void stderr_redirect_handler(owl_dispatch *d)
+void stderr_redirect_handler(const owl_io_dispatch *d, void *data)
 {
   int navail, bread;
@@ -521 +521 @@
   owl_global_set_haveaim(&g);
 
-  /* prepare stdin dispatch */
-  {
-    owl_dispatch *d = owl_malloc(sizeof(owl_dispatch));
-    d->fd = STDIN;
-    d->cfunc = &owl_process_input;
-    d->destroy = NULL;
-    owl_select_add_dispatch(d);
-  }
-
+  /* register STDIN dispatch; throw away return, we won't need it */
+  owl_select_add_io_dispatch(STDIN, OWL_IO_READ, &owl_process_input, NULL, NULL);
   owl_zephyr_initialize();
 
 #if OWL_STDERR_REDIR
   /* Do this only after we've started curses up... */
-  {
-    owl_dispatch *d = owl_malloc(sizeof(owl_dispatch));
-    owl_function_debugmsg("startup: doing stderr redirection");
-    d->fd = stderr_replace();
-    d->cfunc = stderr_redirect_handler;
-    d->destroy = NULL;
-    owl_select_add_dispatch(d);
-  }
+  owl_function_debugmsg("startup: doing stderr redirection");
+  owl_select_add_io_dispatch(stderr_replace(), OWL_IO_READ, &stderr_redirect_handler, NULL, NULL);
 #endif