IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 20840


Ignore:
Timestamp:
Nov 25, 2008, 4:52:39 PM (17 years ago)
Author:
eugene
Message:

fix pedantic errors (unused vars, undef functions, mis-casts)

Location:
branches/eam_branch_20081124/Ohana/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20081124/Ohana/src/delstar/src/parse_time.c

    r12332 r20840  
    3131  gfits_scan (header, UTKeyword, "%s", 1, line);
    3232  /* remove ':' characters */
    33   for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
     33  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
    3434  sscanf (line, "%d %d %d", &hour, &min, &sec);
    3535
    3636  /* parse mode line */
    3737  uppercase (DateMode);
    38   for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char ) NULL; c = strchr (c + 1, 'Y'), Ny++);
     38  for (Ny = 0, c = strchr (DateMode, 'Y'); c != NULL; c = strchr (c + 1, 'Y'), Ny++);
    3939  if ((Ny != 2) && (Ny != 4)) {
    4040    Shutdown ("error in DATE-MODE format: %s", DateMode);
    … …  
    4343  pm = strchr (DateMode, 'M');
    4444  pd = strchr (DateMode, 'D');
    45   if ((py == (char *) NULL) || (pm == (char *) NULL) || (pd == (char *) NULL)) {
     45  if ((py == NULL) || (pm == NULL) || (pd == NULL)) {
    4646    Shutdown ("error in DATE-MODE format: %s", DateMode);
    4747  }
    … …  
    6565  gfits_scan (header, DateKeyword, "%s",  1, line);
    6666  /* remove possible separators: ':', '/' '.', '-' */
    67   for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
    68   for (c = strchr (line, 0x2f); c != (char *) NULL; c = strchr (line, 0x2f)) { *c = ' '; }
    69   for (c = strchr (line, 0x2e); c != (char *) NULL; c = strchr (line, 0x2e)) { *c = ' '; }
    70   for (c = strchr (line, 0x2d); c != (char *) NULL; c = strchr (line, 0x2d)) { *c = ' '; }
     67  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
     68  for (c = strchr (line, 0x2f); c != NULL; c = strchr (line, 0x2f)) { *c = ' '; }
     69  for (c = strchr (line, 0x2e); c != NULL; c = strchr (line, 0x2e)) { *c = ' '; }
     70  for (c = strchr (line, 0x2d); c != NULL; c = strchr (line, 0x2d)) { *c = ' '; }
    7171
    7272  Nf = 0;

  • branches/eam_branch_20081124/Ohana/src/imregister/base/parse_time.c

    r14590 r20840  
    3131  warn_scan (header, UTKeyword, "%s", 1, line);
    3232  /* remove ':' characters */
    33   for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
     33  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
    3434  sscanf (line, "%d %d %d", &hour, &min, &sec);
    3535
    3636  /* parse mode line */
    3737  uppercase (DateMode);
    38   for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char ) NULL; c = strchr (c + 1, 'Y'), Ny++);
     38  for (Ny = 0, c = strchr (DateMode, 'Y'); c != NULL; c = strchr (c + 1, 'Y'), Ny++);
    3939  if ((Ny != 2) && (Ny != 4)) {
    4040    fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
    … …  
    4444  pm = strchr (DateMode, 'M');
    4545  pd = strchr (DateMode, 'D');
    46   if ((py == (char *) NULL) || (pm == (char *) NULL) || (pd == (char *) NULL)) {
     46  if ((py == NULL) || (pm == NULL) || (pd == NULL)) {
    4747    fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
    4848    exit (0);
    … …  
    7070  warn_scan (header, DateKeyword, "%s",  1, line);
    7171  /* remove possible separators: ':', '/' '.', '-' */
    72   for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
    73   for (c = strchr (line, 0x2f); c != (char *) NULL; c = strchr (line, 0x2f)) { *c = ' '; }
    74   for (c = strchr (line, 0x2e); c != (char *) NULL; c = strchr (line, 0x2e)) { *c = ' '; }
    75   for (c = strchr (line, 0x2d); c != (char *) NULL; c = strchr (line, 0x2d)) { *c = ' '; }
     72  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
     73  for (c = strchr (line, 0x2f); c != NULL; c = strchr (line, 0x2f)) { *c = ' '; }
     74  for (c = strchr (line, 0x2e); c != NULL; c = strchr (line, 0x2e)) { *c = ' '; }
     75  for (c = strchr (line, 0x2d); c != NULL; c = strchr (line, 0x2d)) { *c = ' '; }
    7676
    7777  Nf = 0;

  • branches/eam_branch_20081124/Ohana/src/kapa2/src/LoadObject.c

    r17466 r20840  
    123123  }
    124124  if (Nbytes_send != Npts_send*sizeof(float)) {
    125     fprintf (stderr, "Kapa Communication error: unexpected data size %d vs %d\n", Nbytes_send, Npts_send*sizeof(float));
     125    fprintf (stderr, "Kapa Communication error: unexpected data size %d vs %ld\n", Nbytes_send, Npts_send*sizeof(float));
    126126  }
    127127

  • branches/eam_branch_20081124/Ohana/src/kapa2/src/PaintOverlay.c

    r19939 r20840  
    55  int i;
    66  int dX, dY, dx, dy;
    7   int x, y, Xmin, Ymin, Xmax, Ymax, Xrange, Yrange;
     7  int Xmin, Ymin, Xmax, Ymax, Xrange, Yrange;
    88  double t, expand, X, Y, pX, pY;
    99 

  • branches/eam_branch_20081124/Ohana/src/libdvo/include/ps1_dev_3_defs.h

    r17190 r20840  
     1Image                   *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, int Nvalues);
     2Image_PS1_DEV_3         *ImageInternalTo_PS1_DEV_3 (Image *in, int Nvalues);
     3
    14PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, int Nvalues);
    25PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, int Nvalues);

  • branches/eam_branch_20081124/Ohana/src/libkapa/src/KiiPicture.c

    r19828 r20840  
    108108int KiiNewPicture2D (int fd, KiiImage *image, KapaImageData *data, Coords *coords) {
    109109
    110   int i, j;
    111   int Npix, Ncolors, NNcolors, size;
    112   float *in, min, max;
    113   char *out, *outbuffer;
    114   double a1, a2;
     110  int j;
     111  int Npix, Ncolors, size;
     112  float min, max;
    115113
    116114  Npix = image[0].Nx*image[0].Ny;

  • branches/eam_branch_20081124/Ohana/src/mosastro/src/parse_time.c

    r7080 r20840  
    3232  gfits_scan (header, UTKeyword, "%s", 1, line);
    3333  /* remove ':' characters */
    34   for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
     34  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
    3535  sscanf (line, "%d %d %d", &hour, &min, &sec);
    3636
    3737  /* parse mode line */
    3838  uppercase (DateMode);
    39   for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char ) NULL; c = strchr (c + 1, 'Y'), Ny++);
     39  for (Ny = 0, c = strchr (DateMode, 'Y'); c != NULL; c = strchr (c + 1, 'Y'), Ny++);
    4040  if ((Ny != 2) && (Ny != 4)) {
    4141    fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
    … …  
    4545  pm = strchr (DateMode, 'M');
    4646  pd = strchr (DateMode, 'D');
    47   if ((py == (char *) NULL) || (pm == (char *) NULL) || (pd == (char *) NULL)) {
     47  if ((py == NULL) || (pm == NULL) || (pd == NULL)) {
    4848    fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
    4949    exit (1);
    … …  
    7171  gfits_scan (header, DateKeyword, "%s",  1, line);
    7272  /* remove possible separators: ':', '/' '.', '-' */
    73   for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
    74   for (c = strchr (line, 0x2f); c != (char *) NULL; c = strchr (line, 0x2f)) { *c = ' '; }
    75   for (c = strchr (line, 0x2e); c != (char *) NULL; c = strchr (line, 0x2e)) { *c = ' '; }
    76   for (c = strchr (line, 0x2d); c != (char *) NULL; c = strchr (line, 0x2d)) { *c = ' '; }
     73  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
     74  for (c = strchr (line, 0x2f); c != NULL; c = strchr (line, 0x2f)) { *c = ' '; }
     75  for (c = strchr (line, 0x2e); c != NULL; c = strchr (line, 0x2e)) { *c = ' '; }
     76  for (c = strchr (line, 0x2d); c != NULL; c = strchr (line, 0x2d)) { *c = ' '; }
    7777
    7878  Nf = 0;
Note: See TracChangeset for help on using the changeset viewer.