IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27588


Ignore:
Timestamp:
Apr 3, 2010, 8:35:01 AM (16 years ago)
Author:
eugene
Message:

some updates for pedantic, optimize (handle return values for some write, system, fscans)

Location:
trunk/Ohana/src
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/test

    • Property svn:ignore

      •  

        old new  
        44catdir.test
        55.dvo
         6relphot.airmass.png
         7relphot.chisq.png
         8relphot.dMcalhist.png
         9relphot.dMhist.png
         10relphot.dvo
         11relphot.iMag.png
         12relphot.Mag.png
         13relphot.Mcal.dMcal.png

  • trunk/Ohana/src/elixir/src/ConfigPID.c

    r10336 r27588  
    4040
    4141  ALLOCATE (username, char, 256);
    42   fscanf (f, "%*s %d", &pid);
    43   fscanf (f, "%*s %s", username);
    44   fscanf (f, "%*s %s", machine);
     42  if (fscanf (f, "%*s %d", &pid) != 1) fprintf (stderr, "error reading pid\n");
     43  if (fscanf (f, "%*s %s", username) != 1) fprintf (stderr, "error reading pid\n");
     44  if (fscanf (f, "%*s %s", machine) != 1) fprintf (stderr, "error reading pid\n");
    4545  fclose (f);
    4646

  • trunk/Ohana/src/elixir/src/DumpStatus.c

    r27435 r27588  
    1212
    1313  if (filename == (char *) NULL) {
    14     system ("tput clear");
     14    if (system ("tput clear") == -1) {
     15      fprintf (stderr, "\n\n\n");
     16    }
    1517    f = stderr;
    1618  } else {

  • trunk/Ohana/src/elixir/src/MachineOps.c

    r27435 r27588  
    209209    /* we can set up the shell here */
    210210    sprintf (line, "setenv PTOLEMY %s\n", ConfigFilename);
    211     write (wsock, line, strlen (line));
     211    if (write (wsock, line, strlen (line)) != strlen(line)) {
     212      return FALSE;
     213    }
    212214    sprintf (line, "umask 002\n");
    213     write (wsock, line, strlen (line));
     215    if (write (wsock, line, strlen (line)) != strlen(line)) {
     216      return FALSE;
     217    }
    214218    return (TRUE);
    215219  } else {
    … …  
    325329
    326330  sprintf (buffer, "exit\n");
    327   write (machine[0].wsock, buffer, strlen(buffer));
     331  if (write (machine[0].wsock, buffer, strlen(buffer)) != strlen(buffer)) {
     332    fprintf (stderr, "can't shutdown %s\n", machine[0].hostname);
     333  }
    328334  close (machine[0].wsock);
    329335  close (machine[0].rsock);
    … …  
    448454
    449455  if (filename == (char *) NULL) {
    450     system ("tput clear");
     456    if (system ("tput clear") == -1) {
     457      fprintf (stderr, "--------\n");
     458    }
    451459    f = stderr;
    452460  } else {

  • trunk/Ohana/src/elixir/src/StartMachine.c

    r10336 r27588  
    2323
    2424  Nout = sprintf (&command[Nbyte], "\n echo PROCESS DONE\n");
    25   write (machine[0].wsock, command, strlen(command));
     25  if (write (machine[0].wsock, command, strlen(command)) != strlen(command)) return (FALSE);
    2626
    2727  gettimeofday (&machine[0].object[0].start, (void *) NULL);

  • trunk/Ohana/src/elixir/src/rconnect.c

    r12332 r27588  
    8787     without setting onintr */
    8888  sprintf (buffer, "onintr\n");
    89   write (*wsock, buffer, strlen(buffer));
     89  status = write (*wsock, buffer, strlen(buffer));
    9090  if ((status == -1) && (errno == EPIPE)) {
    9191    fprintf (stderr, "socket closed unexpectedly\n");

  • trunk/Ohana/src/libautocode/def/autocode.c

    r27435 r27588  
    113113int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy) {
    114114
    115   int Nbytes;
     115  int Nwrite, Nbytes;
    116116  $STRUCT *tmpdata;
    117117
    … …  
    129129  SendCommand (device, 16, "NVALUE: %6d", Ndata);
    130130  SendCommand (device, 16, "NBYTES: %6d", Nbytes);
    131   write (device, tmpdata, Nbytes);
     131  Nwrite = write (device, tmpdata, Nbytes);
     132  if (Nwrite != Nbytes) {
     133    return (FALSE);
     134  }
    132135 
    133136  /* perform handshaking? */

  • trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c

    r27435 r27588  
    248248  /* rewind file pointers and truncate */
    249249  fseeko (f, 0LL, SEEK_SET);
    250   ftruncate (fileno (catalog[0].f), 0);
     250  if (ftruncate (fileno (catalog[0].f), 0)) {
     251    if (VERBOSE) fprintf (stderr, "failed to truncate file\n");
     252    goto failure;
     253  }
    251254  ftable.header = &header;
    252255

  • trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

    r27580 r27588  
    285285  f = catalog[0].f;
    286286  fseeko (f, 0, SEEK_SET);
    287   ftruncate (fileno (catalog[0].f), 0);
     287  if (ftruncate (fileno (catalog[0].f), 0)) {
     288    if (VERBOSE) fprintf (stderr, "failed to truncate file\n");
     289    goto failure;
     290  }
    288291
    289292  /* write header data (use gfits_write_header?) */

  • trunk/Ohana/src/libkapa/src/IOfuncs.c

    r18277 r27588  
    99int KiiSendData (int device, char *data, int Nbytes) {
    1010
     11  int Nwrite;
     12
    1113  KiiSendCommand (device, 16, "LEN: %11d", Nbytes);
    12   write (device, data, Nbytes);
     14  Nwrite = write (device, data, Nbytes);
     15  if (Nwrite != Nbytes) return (FALSE);
    1316  return (TRUE);
    1417}
    … …  
    2124  /* read 16 bytes: LEN (length) */
    2225  status = read (device, buffer, 16);
     26  if (status != 16) return NULL;
    2327  buffer[16] = 0;
    2428
    … …  
    2630  sscanf (buffer, "%*s %d", &Nbytes);
    2731  ALLOCATE (data, char, Nbytes + 1);
    28   read (device, data, Nbytes);
     32  status = read (device, data, Nbytes);
     33  if (status != Nbytes) {
     34    free (data);
     35    return NULL;
     36  }
     37
    2938  data[Nbytes] = 0;
    3039
    … …  
    108117int KiiSendCommandV (int device, int length, char *format, va_list argp) {
    109118
     119  int Nwrite;
    110120  char *string;
    111121
    … …  
    116126  vsnprintf (string, length + 1, format, argp);
    117127
    118   write (device, string, length);
     128  Nwrite = write (device, string, length);
     129  if (Nwrite != length) return (FALSE);
    119130
    120131  if (DEBUG) fprintf (stderr, "send: %s\n", string);

  • trunk/Ohana/src/libkapa/src/KapaOpen.c

    r16810 r27588  
    228228    sprintf (line, "%s -name '%s' &", kapa_exec, kapa_name);
    229229  }
    230   system (line);
     230  if (system (line) == -1) {
     231    fprintf (stderr, "failed to launch kapa\n");
     232    return 0;
     233  }
    231234
    232235# define NTRY 500
    … …  
    273276    sprintf (temp, "%s -socket %s -name %s &", kapa_exec, socket_name, name);
    274277  }
    275   system (temp);
     278  if (system (temp) == -1) {
     279    fprintf (stderr, "failed to launch kapa\n");
     280    return 0;
     281  }
    276282
    277283  AddressLength =  sizeof (Address);

  • trunk/Ohana/src/libkapa/src/KapaWindow.c

    r25757 r27588  
    232232int KapaPlotVector (int fd, int Npts, float *values, char *type) {
    233233
    234   int Nbytes;
     234  int Nbytes, Nwrite;
    235235  int swap;
    236236
    … …  
    256256  KiiSendMessage (fd, "%s %d %d %d", type, Npts, Nbytes, swap);
    257257
    258   write (fd, values, Nbytes);
     258  Nwrite = write (fd, values, Nbytes);
     259  if (Nwrite != Nbytes) {
     260    fprintf (stderr, "error sending data\n");
     261    return FALSE;
     262  }
    259263  KiiWaitAnswer (fd, "DONE");
    260264  return (TRUE);

  • trunk/Ohana/src/libkapa/src/KiiOpen.c

    r5852 r27588  
    2929    sprintf (temp, "%s %s -name %s &", kii_exec, socket_name, name);
    3030  }
    31   system (temp);
     31  if (system (temp) == -1) {
     32    fprintf (stderr, "error starting Kapa\n");
     33  }
     34
    3235
    3336  AddressLength =  sizeof (Address);

  • trunk/Ohana/src/libkapa/src/KiiOverlay.c

    r26891 r27588  
    5252int KiiLoadOverlay (int fd, KiiOverlay *overlay, int Noverlay, char *overname) {
    5353
    54   int i, overnum, Ntextdata, NTEXTDATA, Ntext, Nchar;
     54  int i, overnum, Ntextdata, NTEXTDATA, Ntext, Nchar, nchar;
    5555  char *textdata;
    5656  KiiOverlayBase *buffer;
    … …  
    8888
    8989  // we could break this into segments if we want to trap an interrupt, but why bother?
    90   Nchar = write (fd, buffer, Noverlay*sizeof(KiiOverlayBase));
     90  nchar = Noverlay*sizeof(KiiOverlayBase);
     91  Nchar = write (fd, buffer, nchar);
     92  if (Nchar != nchar) {
     93    fprintf (stderr, "comm error\n");
     94    return FALSE;
     95  }
    9196  KiiWaitAnswer (fd, "DONE");
    9297
    93   write (fd, textdata, Ntextdata);
     98  Nchar = write (fd, textdata, Ntextdata);
     99  if (Nchar != Ntextdata) {
     100    fprintf (stderr, "comm error\n");
     101    return FALSE;
     102  }
    94103  KiiWaitAnswer (fd, "DONE"); // this 'DONE' notes the end of the textdata buffer
    95104

  • trunk/Ohana/src/libkapa/src/KiiPicture.c

    r20936 r27588  
    2121int KiiNewPicture1D (int fd, KiiImage *image, KapaImageData *data, Coords *coords) {
    2222
    23   int Npix, Ncolors, size;
     23  int Nwrite, Npix, Ncolors, size;
    2424  float *in, min, max;
    2525
    … …  
    4444
    4545  /* send the image data */
    46   write (fd, image[0].data1d, size);
     46  Nwrite = write (fd, image[0].data1d, size);
     47  if (Nwrite != size) {
     48    fprintf (stderr, "error reading picture\n");
     49    return (FALSE);
     50  }
    4751
    4852  KiiWaitAnswer (fd, "DONE");
    … …  
    5357
    5458  int i;
    55   int Npix, Ncolors, NNcolors, size;
     59  int Nwrite, Npix, Ncolors, NNcolors, size;
    5660  float *in, min, max;
    5761  char *out, *outbuffer;
    … …  
    99103
    100104  /* send the image data */
    101   write (fd, outbuffer, size);
     105  Nwrite = write (fd, outbuffer, size);
     106  if (Nwrite != size) {
     107    fprintf (stderr, "error reading picture\n");
     108    return (FALSE);
     109  }
    102110  free (outbuffer);
    103111
    … …  
    109117
    110118  int j;
    111   int Npix, Ncolors, size;
     119  int Nwrite, Nbytes, Npix, Ncolors, size;
    112120  float min, max;
    113121
    … …  
    132140
    133141  for (j = 0; j < image[0].Ny; j++) {
    134       write (fd, image[0].data2d[j], image[0].Nx*sizeof(float));
     142    Nbytes = image[0].Nx*sizeof(float);
     143    Nwrite = write (fd, image[0].data2d[j], Nbytes);
     144    if (Nwrite != size) {
     145      fprintf (stderr, "error reading picture\n");
     146      return (FALSE);
     147    }
    135148  }
    136149

  • trunk/Ohana/src/relastro/src/UpdateObjects.c

    r27581 r27588  
    5050  double Tmin, Tmax, Tmean, Trange;
    5151
     52  memset (&fit,    0, sizeof(fit));
     53  memset (&fitAve, 0, sizeof(fitAve));
     54  memset (&fitPM,  0, sizeof(fitPM));
     55  memset (&fitPAR, 0, sizeof(fitPAR));
     56 
    5257  initObjectData (catalog, Ncatalog);
    5358

  • trunk/Ohana/src/relastro/src/plotstuff.c

    r17203 r27588  
    125125  if (PLOTDELAY > 500000) {
    126126    fprintf (stdout, "press return\n");
    127     fscanf (stdin, "%*c");
     127    if (fscanf (stdin, "%*c") != 0) fprintf (stderr, "\n");
    128128  } else {
    129129    usleep (PLOTDELAY);
Note: See TracChangeset for help on using the changeset viewer.