Index: /trunk/Ohana/src/opihi/doc/Change.log
===================================================================
--- /trunk/Ohana/src/opihi/doc/Change.log	(revision 5427)
+++ /trunk/Ohana/src/opihi/doc/Change.log	(revision 5428)
@@ -1,2 +1,6 @@
+
+opihi-2-4: release 2005.10.20
+  minor changes to use new libohana (v1.5) / libfits (v1.4)
+  kapa/kii cursor interaction modified (needs kapa v1.3, kii v1.3)
 
 opihi-2-3: release 2005.08.15
Index: unk/Ohana/src/opihi/lib.data/IOBufferOps.c
===================================================================
--- /trunk/Ohana/src/opihi/lib.data/IOBufferOps.c	(revision 5427)
+++ 	(revision )
@@ -1,85 +1,0 @@
-# include "data.h"
-
-int InitIOBuffer (IOBuffer *buffer, int Nalloc) {
-
-  buffer[0].Nalloc = Nalloc;
-  buffer[0].Nreset = Nalloc;
-  buffer[0].Nblock = Nalloc / 2;
-  buffer[0].Nbuffer = 0;
-
-  ALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
-  bzero (buffer[0].buffer, buffer[0].Nalloc);
-
-  return (TRUE);
-}
-
-int FlushIOBuffer (IOBuffer *buffer) {
-
-  buffer[0].Nbuffer = 0;
-  buffer[0].Nalloc = buffer[0].Nreset;
-  REALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
-  bzero (buffer[0].buffer, buffer[0].Nalloc);
-
-  return (TRUE);
-}
-
-int ReadtoIOBuffer (IOBuffer *buffer, int fd) {
-
-  int Nread, Nfree;
-
-  if (fd == 0) {
-    /* pipe is closed */
-    return (0);
-  }
-
-  Nfree = buffer[0].Nalloc - buffer[0].Nbuffer;
-  if (Nfree < buffer[0].Nblock) {
-    buffer[0].Nalloc += 2*buffer[0].Nblock;
-    REALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
-    Nfree = buffer[0].Nalloc - buffer[0].Nbuffer;
-    bzero (buffer[0].buffer + buffer[0].Nbuffer, Nfree);
-  }
-
-  Nread = read (fd, &buffer[0].buffer[buffer[0].Nbuffer], buffer[0].Nblock);
-
-  if (Nread >= 0) {
-    buffer[0].Nbuffer += Nread;
-    return (Nread);
-  }
-
-  if (Nread == -1) {
-    switch (errno) {
-    case EAGAIN:
-    case EIO:
-      /** no data available in pipe **/
-      return (-1);
-    default:
-      /** error reading from pipe **/
-      perror ("ReadtoIOBuffer read error");
-      return (-2);
-    }
-  }
-  return (Nread);
-}
-
-/* read until buffer is empty (Nmax retries) */
-int EmptyIOBuffer (IOBuffer *buffer, int Nmax, int fd) {
-
-  int i, status;
-
-  status = -1;
-  for (i = 0; (status != 0) && (i < Nmax); i++) {
-    status = ReadtoIOBuffer (buffer, fd);
-    if (status == -1) usleep (10000);
-    if (status > 0) i = 0;
-  }
-  if (status == -1) return (FALSE);
-  return (TRUE);
-}
-
-void FreeIOBuffer (IOBuffer *buffer) {
-
-  if (buffer[0].buffer != (char *) NULL) {
-    free (buffer[0].buffer);
-  }
-}
Index: unk/Ohana/src/opihi/pantasks/IOBufferOps.c
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/IOBufferOps.c	(revision 5427)
+++ 	(revision )
@@ -1,69 +1,0 @@
-# include "pclient.h"
-
-int InitIOBuffer (IOBuffer *buffer, int Nalloc) {
-
-  buffer[0].Nalloc = Nalloc;
-  buffer[0].Nreset = Nalloc;
-  buffer[0].Nblock = Nalloc / 2;
-  buffer[0].Nbuffer = 0;
-
-  ALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
-  bzero (buffer[0].buffer, buffer[0].Nalloc);
-
-  return (TRUE);
-}
-
-int FlushIOBuffer (IOBuffer *buffer) {
-
-  buffer[0].Nbuffer = 0;
-  buffer[0].Nalloc = buffer[0].Nreset;
-  REALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
-
-  return (TRUE);
-}
-
-int ReadtoIOBuffer (IOBuffer *buffer, int fd) {
-
-  int Nread, Nfree;
-
-  if (fd == 0) {
-    fprintf (stderr, "pipe is closed (ReadIOBuffer)\n");
-    return (0);
-    /* pipe is closed */
-  }
-
-  Nfree = buffer[0].Nalloc - buffer[0].Nbuffer;
-  if (Nfree < buffer[0].Nblock) {
-    buffer[0].Nalloc += 2*buffer[0].Nblock;
-    REALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
-    Nfree = buffer[0].Nalloc - buffer[0].Nbuffer;
-  }
-
-  Nread = read (fd, &buffer[0].buffer[buffer[0].Nbuffer], buffer[0].Nblock);
-
-  if (Nread >= 0) {
-    buffer[0].Nbuffer += Nread;
-    return (Nread);
-  }
-
-  if (Nread == -1) {
-    switch (errno) {
-    case EAGAIN:
-    case EIO:
-      /** no data available in pipe **/
-      return (-1);
-    default:
-      /** error reading from pipe **/
-      perror ("ReadtoIOBuffer read error");
-      return (-2);
-    }
-  }
-  return (Nread);
-}
-
-void FreeIOBuffer (IOBuffer *buffer) {
-
-  if (buffer[0].buffer != (char *) NULL) {
-    free (buffer[0].buffer);
-  }
-}