IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 9, 2008, 12:15:16 PM (18 years ago)
Author:
eugene
Message:

updates to fix compile errors caught by Wall, Werror

Location:
trunk/Ohana/src/opihi
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.astro/coord_systems.c

    r16935 r17419  
    5656          transform->isIdentity = TRUE;
    5757          break;
     58        default:
     59          abort();
    5860      }
    5961    case COORD_GALACTIC:
    … …  
    7274        case COORD_ECLIPTIC:
    7375          return NULL;
     76        default:
     77          abort();
    7478      }
     79    default:
     80      abort();
    7581  }
    7682 

  • trunk/Ohana/src/opihi/cmd.data/book_commands.c

    r16631 r17419  
    380380int book_shuffle (int argc, char **argv) {
    381381
    382   int where, N;
    383   char *varName, *keyName, *keyValue;
    384   Book *book;
    385   Page *page;
     382  Book *book;
    386383
    387384  if (argc != 2) {

  • trunk/Ohana/src/opihi/cmd.data/vzload.c

    r17123 r17419  
    66  int kapa, type;
    77  char *name;
    8   double dx, dy, size;
    9   double min, range, MAX_OUTPUT_SIZE;
     8  double size, min, range, MAX_OUTPUT_SIZE;
    109  KiiOverlay *overlay;
    1110  Vector *vecx, *vecy, *vecz;

  • trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

    r17254 r17419  
    7676  double ra, dec, x, y, dT;
    7777
    78   Image *image;
    7978  Coords *mosaic;
    8079  PhotCode *equiv;
    … …  
    132131            break;
    133132          }
    134           Nsec = GetPhotcodeNsec (equiv);
     133          Nsec = GetPhotcodeNsec (equiv->code);
    135134          if (Nsec == -1) break;
    136135          value = secfilt[Nsec].Ncode;
    … …  
    141140            break;
    142141          }
    143           Nsec = GetPhotcodeNsec (equiv);
     142          Nsec = GetPhotcodeNsec (equiv->code);
    144143          if (Nsec == -1) break;
    145144          value = secfilt[Nsec].Nused;
    … …  
    317316      value = measure[0].Xccd;
    318317# else
    319       ra  = average[0].R - measure[0].dR / 3600.0;
    320       dec = average[0].D - measure[0].dD / 3600.0;
    321       image = MatchImage (measure[0].t, measure[0].photcode);
    322       if (image == NULL) break;
    323       RD_to_XY (&x, &y, ra, dec, &image[0].coords);
    324       value = x;
     318      {
     319        Image *image;
     320        ra  = average[0].R - measure[0].dR / 3600.0;
     321        dec = average[0].D - measure[0].dD / 3600.0;
     322        image = MatchImage (measure[0].t, measure[0].photcode);
     323        if (image == NULL) break;
     324        RD_to_XY (&x, &y, ra, dec, &image[0].coords);
     325        value = x;
     326      }
    325327# endif
    326328      break;
    … …  
    330332      value = measure[0].Yccd;
    331333# else
    332       ra  = average[0].R - measure[0].dR / 3600.0;
    333       dec = average[0].D - measure[0].dD / 3600.0;
    334       image = MatchImage (measure[0].t, measure[0].photcode);
    335       if (image == NULL) break;
    336       RD_to_XY (&x, &y, ra, dec, &image[0].coords);
    337       value = y;
     334      {
     335        Image *image;
     336        ra  = average[0].R - measure[0].dR / 3600.0;
     337        dec = average[0].D - measure[0].dD / 3600.0;
     338        image = MatchImage (measure[0].t, measure[0].photcode);
     339        if (image == NULL) break;
     340        RD_to_XY (&x, &y, ra, dec, &image[0].coords);
     341        value = y;
     342      }
    338343# endif
    339344      break;

  • trunk/Ohana/src/opihi/include/astro.h

    r16935 r17419  
    1010
    1111void InitAstro ();
     12void FreeAstro ();
    1213
    1314typedef struct {

  • trunk/Ohana/src/opihi/include/basic.h

    r7892 r17419  
    55void cleanup ();
    66void InitBasic ();
     7void FreeBasic ();
    78void InitBasic_PantasksClient ();

  • trunk/Ohana/src/opihi/include/data.h

    r16631 r17419  
    3434
    3535void InitData ();
     36void FreeData ();
    3637
    3738/* in book.c */
    … …  
    153154int ibracket (int *list, int Nlist, int mode, double value);
    154155
     156void FreeKapa ();
     157void FreeQueues ();
     158void FreeBooks ();
     159
    155160# endif
    156 

  • trunk/Ohana/src/opihi/include/dvoshell.h

    r17199 r17419  
    188188int           GetTimeSelection      PROTO((time_t *tz, time_t *te));
    189189void          InitDVO               PROTO(());
     190void          FreeDVO               PROTO(());
    190191int           InitPhotcodes         PROTO(());
    191192Image        *LoadImages            PROTO((int *Nimage));
    … …  
    262263int dbExtractMeasuresInitMeas ();
    263264
     265int dbExtractAveragesInitTransform (CoordTransformSystem target);
     266int dbExtractAveragesInit ();
     267
    264268# endif

  • trunk/Ohana/src/opihi/include/mana.h

    r4689 r17419  
    66
    77void InitMana ();
     8void FreeMana ();
    89int *findrowpeaks (float *row, int Nrow, float threshold, int *npeaks);
    910

  • trunk/Ohana/src/opihi/include/pantasks.h

    r15797 r17419  
    162162
    163163void InitPantasks ();
     164void FreePantasks ();
     165
    164166void InitPantasksServer ();
     167void FreePantasksServer ();
     168
    165169void InitPantasksClient ();
     170void FreePantasksClient ();
     171
    166172void InitTasks ();
     173void FreeTasks ();
     174
    167175Task *NextTask ();
    168176Task *FindTask (char *name);
    … …  
    187195
    188196int NextJobID ();
    189 int InitJobIDs ();
     197void InitJobIDs ();
     198void FreeJobIDs ();
    190199int FreeJobID (int ID);
    191200
    192201void InitJobs ();
     202void FreeJobs ();
     203
    193204Job *NextJob ();
    194205Job *FindJob (int JobID);
    … …  
    256267// functions related to the queue of input files
    257268void InitInputs ();
     269void FreeInputs ();
    258270void AddNewInput (char *input);
    259271int DeleteInput (char *input);

  • trunk/Ohana/src/opihi/include/pclient.h

    r4693 r17419  
    4545
    4646int InitChild ();
     47int FreeChild ();
    4748int CheckChild ();
    4849void CheckChildStatus ();
    4950
    5051void InitPclient ();
     52void FreePclient ();
    5153void gotsignal (int signum);
    5254

  • trunk/Ohana/src/opihi/include/pcontrol.h

    r16486 r17419  
    125125
    126126void InitPcontrol ();
     127void FreePcontrol ();
    127128
    128129/*** StackOps.c ***/
    129130Stack *InitStack ();
     131void   FreeStack (Stack *stack);
    130132int    PushStack (Stack *stack, int where, void *object, int id, char *name);
    131133void  *PullStackByLocation (Stack *stack, int where);
    … …  
    184186/*** HostOps.c ***/
    185187void   InitHostStacks ();
     188void   FreeHostStacks ();
    186189Stack *GetHostStack (int StackID);
    187190char  *GetHostStackName (int StackID);
    … …  
    204207/*** JobOps.c ***/
    205208void   InitJobStacks ();
     209void   FreeJobStacks ();
    206210Stack *GetJobStack (int StackID);
    207211char  *GetJobStackName (int StackID);

  • trunk/Ohana/src/opihi/include/shell.h

    r16434 r17419  
    6565int           opihi                     PROTO((int argc, char **argv));
    6666int           multicommand              PROTO((char *line));
     67int getServer ();
    6768void          multicommand_InitServer   PROTO((void));
     69void multicommand_StopServer ();
     70
    6871int           command                   PROTO((char *line, char **outline, int VERBOSE));
    6972char         *expand_vars               PROTO((char *line));
    … …  
    111114
    112115int           ConfigInit                PROTO((int *argc, char **argv));
     116void          ConfigFree                PROTO((void));
    113117char         *VarConfig                 PROTO((char *keyword, char *mode, void *ptr));
    114118char         *VarConfigEntry            PROTO((char *keyword, char *mode, int entry, void *ptr));
    … …  
    170174int DefineValidIP ();
    171175
     176void FreeCommands ();
     177void FreeMacros ();
     178void FreeBuffers ();
     179void FreeVectors ();
     180void FreeVariables ();
     181void FreeLists ();
     182
    172183# endif
    173 

  • trunk/Ohana/src/opihi/lib.data/page.c

    r16885 r17419  
    137137
    138138  int i, N, *seq;
    139   Page *page;
    140139
    141140  N = book[0].Npages;

  • trunk/Ohana/src/opihi/lib.shell/VariableOps.c

    r16892 r17419  
    142142 
    143143  int i;
    144   char *local, *MacroName, *value;
     144  char *local, *value;
    145145
    146146  if (name == NULL) return (NULL);

  • trunk/Ohana/src/opihi/lib.shell/gprint.c

    r17390 r17419  
    223223void gprintSetFile (gpStream *stream, gpDest dest, char *filename) {
    224224
    225   int i, Nmatch;
    226225  FILE *file;
    227226

  • trunk/Ohana/src/opihi/pantasks/JobIDOps.c

    r16450 r17419  
    55static int   JobIDPtr;
    66
    7 int InitJobIDs () {
     7void InitJobIDs () {
    88
    99  JobIDPtr = 0;
    1010  ALLOCATE (JobIDList, char, MAX_N_JOBS);
    1111  bzero (JobIDList, MAX_N_JOBS*sizeof(char));
    12   return (TRUE);
    1312} 
    1413
    15 int FreeJobIDs () {
     14void FreeJobIDs () {
    1615  free (JobIDList);
    1716}

  • trunk/Ohana/src/opihi/pclient/init.c

    r16455 r17419  
    1 # include "opihi.h"
     1# include "pclient.h"
    22
    33int job             PROTO((int, char **));
Note: See TracChangeset for help on using the changeset viewer.