Changeset 7929 for trunk/Ohana/src/libohana

Timestamp:

Jul 18, 2006, 6:58:54 AM (20 years ago)

Author:

eugene

Message:

updates to fix comm problems with buffers (motivated by opihi gprint)

Location:

trunk/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/CommOps.c (modified) (2 diffs)
• src/IOBufferOps.c (modified) (2 diffs)

trunk/Ohana/src/libohana/include/ohana.h

@@ -173 +173 @@
 int ExpectCommand (int device, int length, double timeout, IOBuffer *buffer);
 int SendMessage (int device, char *format, ...);
+int SendMessageFixed (int device, int length, char *messge);
 int SendCommand (int device, int length, char *format, ...);
 int SendCommandV (int device, int length, char *format, va_list argp);

trunk/Ohana/src/libohana/src/CommOps.c

@@ -88 +88 @@
 }
 
+/* send a message of known size, sending the size first */
+int SendMessageFixed (int device, int length, char *message) {
+
+  int status;
+
+  status = SendCommand (device, 16, "NBYTES: %6d", length);
+  status = SendCommand (device, length, message);
+  return (status);
+}
+
 int SendCommand (int device, int length, char *format, ...) {
 
@@ -108 +118 @@
   vsnprintf (string, length + 1, format, argp);
 
-  /* fprintf (stderr, "msg: %s\n", string); */
   write (device, string, length);
   free (string);

trunk/Ohana/src/libohana/src/IOBufferOps.c

@@ -107 +107 @@
   Nbyte = vsnprintf (&tmp, 0, format, argp);
 
-  if (buffer[0].Nbuffer + Nbyte + 1 >= buffer[0].Nalloc) {
+  if (buffer[0].Nbuffer + Nbyte + 1>= buffer[0].Nalloc) {
     buffer[0].Nalloc = buffer[0].Nbuffer + Nbyte + 64;
     REALLOCATE (buffer[0].buffer, char, buffer[0].Nalloc);
@@ -113 +113 @@
 
   vsnprintf (&buffer[0].buffer[buffer[0].Nbuffer], Nbyte + 1, format, argp);
-  buffer[0].Nbuffer += Nbyte + 1;
+  buffer[0].Nbuffer += Nbyte;
   return (TRUE);
 }