Index: trunk/Ohana/src/kapa/graph/LoadObject.c
===================================================================
--- trunk/Ohana/src/kapa/graph/LoadObject.c	(revision 5612)
+++ trunk/Ohana/src/kapa/graph/LoadObject.c	(revision 5852)
@@ -1,17 +1,8 @@
 # include "Ximage.h"
-# include <unistd.h>
 # include <errno.h>
-
-# define SCAN \
-status = read (sock, buffer, 16); \
-buffer[16] = 0; \
-sscanf (buffer, "%*s %d", &Nbytes); \
-status = read (sock, buffer, Nbytes); \
-buffer[status] = 0;
 
 int LoadObject () {
   
-  char buffer[1024];
-  int status, N, Nbytes;
+  int N;
   Layout *layout;
 
@@ -27,27 +18,25 @@
   layout[0].objects[N].dym = layout[0].objects[N].dyp = (float *) NULL;
   
-  SCAN;
-  sscanf (buffer, "%d %d %d %d %d %d %d %lf %lf",
-	  &layout[0].objects[N].Npts, &layout[0].objects[N].style, 
-	  &layout[0].objects[N].ptype, &layout[0].objects[N].ltype, 
-	  &layout[0].objects[N].etype, &layout[0].objects[N].ebar, 
-	  &layout[0].objects[N].color, 
-	  &layout[0].objects[N].lweight, &layout[0].objects[N].size);
+  KiiScanMessage (sock, "%d %d %d %d %d %d %d %lf %lf",
+		  &layout[0].objects[N].Npts, &layout[0].objects[N].style, 
+		  &layout[0].objects[N].ptype, &layout[0].objects[N].ltype, 
+		  &layout[0].objects[N].etype, &layout[0].objects[N].ebar, 
+		  &layout[0].objects[N].color, 
+		  &layout[0].objects[N].lweight, &layout[0].objects[N].size);
   
   if (DEBUG) fprintf (stderr, "%d %d %d %d %d %d %d %lf %lf\n",
-	  layout[0].objects[N].Npts, layout[0].objects[N].style, 
-	  layout[0].objects[N].ptype, layout[0].objects[N].ltype, 
-	  layout[0].objects[N].etype, layout[0].objects[N].ebar, 
-	  layout[0].objects[N].color, 
-	  layout[0].objects[N].lweight, layout[0].objects[N].size);
+		      layout[0].objects[N].Npts, layout[0].objects[N].style, 
+		      layout[0].objects[N].ptype, layout[0].objects[N].ltype, 
+		      layout[0].objects[N].etype, layout[0].objects[N].ebar, 
+		      layout[0].objects[N].color, 
+		      layout[0].objects[N].lweight, layout[0].objects[N].size);
   
   /* force valid ranges */
-  if ((layout[0].objects[N].color > GetColormapSize()) || (layout[0].objects[N].color < 0))
+  if ((layout[0].objects[N].color > KapaColormapSize()) || (layout[0].objects[N].color < 0))
     layout[0].objects[N].color = 0;
 
-  SCAN;
-  sscanf (buffer, "%lf %lf %lf %lf",
-	  &layout[0].objects[N].x0, &layout[0].objects[N].x1, 
-	  &layout[0].objects[N].y0, &layout[0].objects[N].y1);
+  KiiScanMessage (sock, "%lf %lf %lf %lf",
+		  &layout[0].objects[N].x0, &layout[0].objects[N].x1, 
+		  &layout[0].objects[N].y0, &layout[0].objects[N].y1);
   
   fcntl (sock, F_SETFL, O_NONBLOCK);