IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 17, 2007, 9:58:42 AM (19 years ago)
Author:
eugene
Message:

rationalized kapa block/non-block, fixed comm problems

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/kapa-mods-2007-05/Ohana/src/libkapa/src/KiiOverlay.c

    r13405 r13409  
    5353
    5454  int i, n, Nline;
    55   char *buffer, *type, word[5];
     55  char *buffer, *type;
    5656
    5757  KiiSelectOverlay (overname, &n);
    … …  
    8484
    8585  free (buffer);
     86  KiiWaitAnswer (fd, "DONE");
    8687
    8788  /* this is very inefficient: 128 bytes per object vs 17 as binary, plus the
    8889     conversions back and forth
    8990  */
    90   KiiScanCommand (fd, 4, "%s", word);
    91   if (strcmp (word, "DONE")) {
    92       fprintf (stderr, "unexpected response %s\n", word);
    93       return (FALSE);
    94   }
     91
    9592  return (TRUE);
    9693}
    … …  
    9996
    10097  int n;
    101   char word[5];
    10298
    10399  KiiSelectOverlay (overname, &n);
    … …  
    105101  KiiSendCommand (fd, 4, "ERSO");
    106102  KiiSendCommand (fd, 16, "OVERLAY %7d ", n);
    107 
    108   KiiScanCommand (fd, 4, "%s", word);
    109   if (strcmp (word, "DONE")) {
    110       fprintf (stderr, "unexpected response %s\n", word);
    111       return (FALSE);
    112   }
     103  KiiWaitAnswer (fd, "DONE");
    113104  return (TRUE);
    114105}
    … …  
    117108
    118109  int n;
    119   char word[5];
    120110
    121111  KiiSelectOverlay (overname, &n);
    … …  
    128118
    129119  KiiSendMessage (fd, "FILE: %d %s", n, file);
    130 
    131   KiiScanCommand (fd, 4, "%s", word);
    132   if (strcmp (word, "DONE")) {
    133       fprintf (stderr, "unexpected response %s\n", word);
    134       return (FALSE);
    135   }
     120  KiiWaitAnswer (fd, "DONE");
    136121  return (TRUE);
    137122}
Note: See TracChangeset for help on using the changeset viewer.