Changeset 12037

Timestamp:

Feb 23, 2007, 5:43:03 PM (19 years ago)

Author:

eugene

Message:

large number of minor changes to fix Wall,Werror messages

Location:

branches/dvo-mods-2007-02/Ohana/src

Files:

• addstar/src/ReadImageHeader.c (modified) (1 diff)
• addstar/src/ReadStarsFITS.c (modified) (1 diff)
• addstar/src/find_matches.c (modified) (2 diffs)
• addstar/src/find_matches_closest.c (modified) (2 diffs)
• elixir/src/rconnect.c (modified) (1 diff)
• gastro/src/plotstuff.c (modified) (1 diff)
• gastro2/src/plotstuff.c (modified) (1 diff)
• imregister/base/misc.c (modified) (2 diffs)
• imregister/detrend/args.detsearch.c (modified) (4 diffs)
• imregister/detrend/output.c (modified) (1 diff)
• imregister/imphot/dumpfits.c (modified) (1 diff)
• imregister/imreg/cadc.c (modified) (1 diff)
• imregister/imreg/output.c (modified) (1 diff)
• imregister/imreg/rconnect.c (modified) (1 diff)
• imregister/include/detrend.h (modified) (4 diffs)
• imregister/include/imphot.h (modified) (1 diff)
• imregister/include/imreg.h (modified) (1 diff)
• imregister/include/imregister.h (modified) (1 diff)
• imregister/include/photreg.h (modified) (1 diff)
• imregister/include/spreg.h (modified) (1 diff)
• imregister/photreg/args.photreg.c (modified) (1 diff)
• imregister/photreg/getImageData.c (modified) (1 diff)
• imregister/photreg/output.c (modified) (1 diff)
• imregister/spreg/output.c (modified) (1 diff)
• imregister/src/imphotmerge.c (modified) (2 diffs)
• kapa/graph/PSObjects.c (modified) (1 diff)
• kii/button/PSit.c (modified) (1 diff)
• libkapa/src/KiiConvert.c (modified) (1 diff)
• libkapa/src/bDrawRotFont.c (modified) (1 diff)
• mosastro/src/ConvertMatch.c (modified) (1 diff)
• nightd/src/misc.c (modified) (1 diff)
• opihi/cmd.basic/macro.c (modified) (1 diff)
• opihi/cmd.data/book_commands.c (modified) (3 diffs)
• opihi/cmd.data/create.c (modified) (1 diff)
• opihi/cmd.data/line.c (modified) (1 diff)
• opihi/cmd.data/queueload.c (modified) (1 diff)
• opihi/dvo/imbox.c (modified) (1 diff)
• opihi/dvo/paverage.c (modified) (1 diff)
• opihi/include/display.h (modified) (1 diff)
• opihi/include/shell.h (modified) (1 diff)
• opihi/lib.data/book.c (modified) (1 diff)
• opihi/lib.data/page.c (modified) (1 diff)
• opihi/lib.shell/ListOps.c (modified) (2 diffs)
• opihi/lib.shell/SocketOps.c (modified) (1 diff)
• opihi/lib.shell/exec_loop.c (modified) (1 diff)
• opihi/lib.shell/opihi.c (modified) (1 diff)
• opihi/lib.shell/version.c (modified) (1 diff)
• opihi/pantasks/CheckTasks.c (modified) (1 diff)
• opihi/pantasks/TaskOps.c (modified) (2 diffs)
• opihi/pantasks/task_stdout.c (modified) (2 diffs)

branches/dvo-mods-2007-02/Ohana/src/addstar/src/ReadImageHeader.c

@@ -5 +5 @@
 int ReadImageHeader (Header *header, Image *image, int photcode) {
 
-  int Nastro, ccdnum, hour, min, simple;
-  double tmp, sec, dMs;
-  char *name, *c, photname[64], line[80];
+  int Nastro, ccdnum, hour, min;
+  double tmp, sec;
+  char *c, photname[64], line[80];
 
   /* get astrometry information */

branches/dvo-mods-2007-02/Ohana/src/addstar/src/ReadStarsFITS.c

@@ -5 +5 @@
 Stars *ReadStarsFITS (FILE *f, Header *header, Header *in_theader, unsigned int *nstars) {
 
-  int i, Nskip, Nstars;
+  int Nskip, Nstars;
   char type[80];
   Header theader;

branches/dvo-mods-2007-02/Ohana/src/addstar/src/find_matches.c

@@ -4 +4 @@
 
   int i, j, n, N, J, status, Nstars;
-  double X, Y, RADIUS, RADIUS2;
+  double RADIUS, RADIUS2;
   float *X1, *Y1, *X2, *Y2;
   float dX, dY, dR;
@@ -10 +10 @@
   int Nave, NAVE, Nmeas, NMEAS, Nmatch;
   int Nsecfilt, Nsec;
-  float Mcat, *Mval;
-  PhotCode *code;
   Coords tcoords;
 

branches/dvo-mods-2007-02/Ohana/src/addstar/src/find_matches_closest.c

@@ -4 +4 @@
 
   int i, j, n, N, J, Jmin, status, Nstars;
-  double X, Y, RADIUS, RADIUS2, Rmin, secz;
+  double RADIUS, RADIUS2, Rmin;
   float *X1, *Y1, *X2, *Y2;
   float dX, dY, dR;
@@ -11 +11 @@
   Coords tcoords;
   int Nsecfilt, Nsec;
-  float Mcat, *Mval, MTIME;
-  PhotCode *code;
 
   /* photcode data - must by of type DEP; options.photcode is equiv PRI/SEC photcode */

branches/dvo-mods-2007-02/Ohana/src/elixir/src/rconnect.c

@@ -40 +40 @@
     fprintf (stderr, "child is spawned\n");
 
-    status = execl (command, file, hostname, "/bin/csh", 0); 
+    status = execl (command, file, hostname, "/bin/csh", NULL); 
     fprintf (stderr, "error starting remote shell process\n");
     Shutdown (1);

branches/dvo-mods-2007-02/Ohana/src/gastro/src/plotstuff.c

@@ -21 +21 @@
 # endif /* ANSI */
 
-  int InitSocket, status, addreslen;
+  int InitSocket, status;
+  socklen_t addreslen;
   struct sockaddr_un Address;
   char temp[100];

branches/dvo-mods-2007-02/Ohana/src/gastro2/src/plotstuff.c

@@ -21 +21 @@
 # endif /* ANSI */
 
-  int InitSocket, status, addreslen;
+  int InitSocket, status;
+  socklen_t addreslen;
   struct sockaddr_un Address;
   char temp[100];

branches/dvo-mods-2007-02/Ohana/src/imregister/base/misc.c

@@ -11 +11 @@
    2 - arguments bad
 */
-int get_trange_arguments (int *argc, char **argv, unsigned long **Tstart, unsigned long **Tstop, int *ntimes) {
+int get_trange_arguments (int *argc, char **argv, time_t **Tstart, time_t **Tstop, int *ntimes) {
 
   int Na, N, Ntimes;
   double trange;
-  unsigned long tmp, *tstart, *tstop;
+  time_t tmp, *tstart, *tstop;
 
   /* allocate space for returned lists */
   Ntimes = 10;
-  ALLOCATE (tstart, unsigned long, Ntimes);
-  ALLOCATE (tstop,  unsigned long, Ntimes);
+  ALLOCATE (tstart, time_t, Ntimes);
+  ALLOCATE (tstop,  time_t, Ntimes);
 
   for (N = 0; ; N++) {
@@ -65 +65 @@
     if (N == Ntimes - 1) {
       Ntimes += 10;
-      REALLOCATE (tstart, unsigned long, Ntimes);
-      REALLOCATE (tstop,  unsigned long, Ntimes);
+      REALLOCATE (tstart, time_t, Ntimes);
+      REALLOCATE (tstop,  time_t, Ntimes);
     }
   }

branches/dvo-mods-2007-02/Ohana/src/imregister/detrend/args.detsearch.c

@@ -10 +10 @@
   Criteria base, *crit;
   int *filt;
-  unsigned long *tstart, *tstop;
+  time_t *tstart, *tstop;
 
   if ((N = get_argument (argc, argv, "-h"))) { usage (); }
@@ -96 +96 @@
  
   /* define time / ranges */
-  tstart = tstop = (unsigned long *) NULL;
+  tstart = tstop = NULL;
   base.TimeSelect = base.tstart = base.tstop = 0;
   if ((N = get_argument (argc, argv, "-time"))) {
@@ -352 +352 @@
 }
 
-Criteria *ExpandBase (Criteria base, int *ncrit, unsigned long *tstart, unsigned long *tstop, int *filt) {
+Criteria *ExpandBase (Criteria base, int *ncrit, time_t *tstart, time_t *tstop, int *filt) {
 
   Criteria *crit;
@@ -370 +370 @@
     for (j = 0; j < Ntimes; j++) {
       crit[Nc] = base;
-      if (tstart != (unsigned long *) NULL) {
+      if (tstart != NULL) {
         crit[Nc].tstart       = tstart[j];
         crit[Nc].tstop        = tstop[j];

branches/dvo-mods-2007-02/Ohana/src/imregister/detrend/output.c

@@ -70 +70 @@
   char *filtstr, *typestr, *modestr, *ccdstr, *datestr, *p;
   int i;
-  unsigned long tsecond;
+  time_t tsecond;
 
   /* create primary header */

branches/dvo-mods-2007-02/Ohana/src/imregister/imphot/dumpfits.c

@@ -55 +55 @@
   int i;
   double zp, dzp, ra, dec, airmass, sky;
-  unsigned long tsecond;
+  time_t tsecond;
 
   /* create primary header */

branches/dvo-mods-2007-02/Ohana/src/imregister/imreg/cadc.c

@@ -8 +8 @@
   int i, Obsid, Nobsid, Nsubset, ref;
   char *datestr, *line, hdrname[99];
-  unsigned long tsecond;
+  time_t tsecond;
   Header header, theader;
   Matrix matrix;

branches/dvo-mods-2007-02/Ohana/src/imregister/imreg/output.c

@@ -92 +92 @@
   char *obsstr, *regstr, *line, dummy[64];
   char *modestr, *typestr, *ccdstr, *datestr;
-  unsigned long tsecond;
+  time_t tsecond;
   Header header, theader;
   Matrix matrix;

branches/dvo-mods-2007-02/Ohana/src/imregister/imreg/rconnect.c

@@ -40 +40 @@
     setvbuf (stderr, (char *) NULL, _IONBF, BUFSIZ);
 
-    status = execl (command, file, hostname, "/bin/csh", 0); 
+    status = execl (command, file, hostname, "/bin/csh", NULL); 
     fprintf (stderr, "error starting remote shell process\n");
     Shutdown (1);

branches/dvo-mods-2007-02/Ohana/src/imregister/include/detrend.h

@@ -7 +7 @@
 
 typedef struct {
-  int TimeSelect;    unsigned long tstart, tstop;
+  int TimeSelect;    time_t tstart, tstop;
   char *label; 
   char *imageID;
@@ -28 +28 @@
   int NameSelect;    char *Name;
   int ExptimeSelect; float Exptime;
-  int TimeSelect;    unsigned long tstart, tstop;
+  int TimeSelect;    time_t tstart, tstop;
   int MatchNumber;
 } Criteria;
@@ -48 +48 @@
 
   char *ModifyEntry, *ModifyValue;
-  unsigned long TimeValue;
+  time_t TimeValue;
   
   int verbose;
@@ -97 +97 @@
 Criteria *MosaicCriteria (Criteria base, char *filename, int *ncrit);
 Criteria *ImageCriteria (Criteria base, char *filename, char *ImageExtend, char *ImageMode, int *ncrit);
-Criteria *ExpandBase (Criteria base, int *ncrit, unsigned long *tstart, unsigned long *tstop, int *filt);
+Criteria *ExpandBase (Criteria base, int *ncrit, time_t *tstart, time_t *tstop, int *filt);
 Criteria *ExpandRecipe (Criteria *base, int *Ncrit);
 

branches/dvo-mods-2007-02/Ohana/src/imregister/include/imphot.h

@@ -3 +3 @@
   int PhotcodeSelect; int photcode;
   int NameSelect;     char *Name;
-  int Ntimes;         unsigned long *tstart, *tstop;
+  int Ntimes;         time_t *tstart, *tstop;
   int CodeSelect;     int Code;
 } criteria;

branches/dvo-mods-2007-02/Ohana/src/imregister/include/imreg.h

@@ -22 +22 @@
   int ProcSelect;    int Proc;
   int DistSelect;    int Dist;
-  int Ntimes;        unsigned long *tstart, *tstop;
+  int Ntimes;        time_t *tstart, *tstop;
   int MatchNumber;
   int Close;

branches/dvo-mods-2007-02/Ohana/src/imregister/include/imregister.h

@@ -69 +69 @@
 int   *filternum;
 
-int get_trange_arguments (int *argc, char **argv, unsigned long **Tstart, unsigned long **Tstop, int *ntimes);
+int get_trange_arguments (int *argc, char **argv, time_t **Tstart, time_t **Tstop, int *ntimes);
 int get_filter_arguments (int *argc, char **argv, int **Filt, int *Nfilt);
 

branches/dvo-mods-2007-02/Ohana/src/imregister/include/photreg.h

@@ -2 +2 @@
 
 struct {
-  int Ntimes;         unsigned long *tstart, *tstop;
+  int Ntimes;         time_t *tstart, *tstop;
   int PhotCodeSelect; int photcode;
   int LabelSelect;    char *Label;

branches/dvo-mods-2007-02/Ohana/src/imregister/include/spreg.h

@@ -20 +20 @@
 
 struct {
-  int Ntimes;           unsigned long *tstart, *tstop;
+  int Ntimes;           time_t *tstart, *tstop;
   int ModeSelect;       int Mode;
   int StateSelect;      int State;

branches/dvo-mods-2007-02/Ohana/src/imregister/photreg/args.photreg.c

@@ -8 +8 @@
   int *list, Nlist;
   int N, Ntimes;
-  unsigned long *tstart, *tstop;
+  time_t *tstart, *tstop;
   PhotCode *photcode, *depcode;
 

branches/dvo-mods-2007-02/Ohana/src/imregister/photreg/getImageData.c

@@ -17 +17 @@
 
   /* get time from image header */
-  ALLOCATE (criteria.tstart, unsigned long, 1);
-  ALLOCATE (criteria.tstart, unsigned long, 1);
+  ALLOCATE (criteria.tstart, time_t, 1);
+  ALLOCATE (criteria.tstart, time_t, 1);
   criteria.tstart[0] = parse_time (&header);
   criteria.tstop[0] = criteria.tstart[0] + 1;

branches/dvo-mods-2007-02/Ohana/src/imregister/photreg/output.c

@@ -81 +81 @@
   char *c1, *c2, *code, *photsys, *extname;
   int i;
-  unsigned long tsecond;
+  time_t tsecond;
 
   /* create primary header */

branches/dvo-mods-2007-02/Ohana/src/imregister/spreg/output.c

@@ -76 +76 @@
   int i;
   char *obsstr, *regstr, *line, *datestr;
-  unsigned long tsecond;
+  time_t tsecond;
   FILE *f;
   Header header, theader;

branches/dvo-mods-2007-02/Ohana/src/imregister/src/imphotmerge.c

@@ -4 +4 @@
 
 Image *LoadImageTable (FILE *f, Header *header, int *nimage);
-static char *version = "imphotcopy $Revision: 1.5.4.2 $";
+static char *version = "imphotcopy $Revision: 1.5.4.3 $";
 
 int main (int argc, char **argv) {
@@ -14 +14 @@
   char *dBFile;
   int Nimage, Ninput, *index, Ntimes;
-  unsigned long *tstart, *tstop;
+  time_t *tstart, *tstop;
   int VERBOSE, PHOTCODE, dbstate;
   int PhotCodeSelect, Nin;

branches/dvo-mods-2007-02/Ohana/src/kapa/graph/PSObjects.c

@@ -13 +13 @@
   FILE *f;
   char filename[1024], pagename[1024], *version;
-  int Nbytes, status;
 
   /* expect a line telling the number of bytes and a filename */

branches/dvo-mods-2007-02/Ohana/src/kii/button/PSit.c

@@ -12 +12 @@
   double scale;
   char filename[1024], pagename[1024], *version;
-  int Nbytes, status;
 
   /* expect a line telling the number of bytes and a filename */

branches/dvo-mods-2007-02/Ohana/src/libkapa/src/KiiConvert.c

@@ -44 +44 @@
   KiiSendCommand (fd, 4, "PSIT");
 
-name:
   KiiSendMessage (fd, "%s %s %d %d", filename, pagename, scaleMode, pageMode);
 

branches/dvo-mods-2007-02/Ohana/src/libkapa/src/bDrawRotFont.c

@@ -12 +12 @@
 
   unsigned char *bitmap;
-  char *currentname, basename[64], *c; 
+  char *currentname, basename[64]; 
   int i, dy, dx, N, X, Y, code;
   int dX, Xoff, dY, Yoff, YoffBase;

branches/dvo-mods-2007-02/Ohana/src/mosastro/src/ConvertMatch.c

@@ -38 +38 @@
   }
 
-  byte = (char *) data;
+  byte = (unsigned char *) data;
   for (i = 0; i < nitems; i++, byte += size) {
     SWAP_DBLE (0);   /* R */

branches/dvo-mods-2007-02/Ohana/src/nightd/src/misc.c

@@ -111 +111 @@
   struct tm *local, *gmt;
   struct timeval now;
-  unsigned long tsec, tref;
+  time_t tsec, tref;
   int dsec;
   float hour;

branches/dvo-mods-2007-02/Ohana/src/opihi/cmd.basic/macro.c

@@ -3 +3 @@
 int macro (int argc, char **argv) {
 
-  int i, N, status;
+  int status;
   CommandF *cmd;
 

branches/dvo-mods-2007-02/Ohana/src/opihi/cmd.data/book_commands.c

@@ -8 +8 @@
 
   ListBooks();
+  return TRUE;
 }
 
@@ -63 +64 @@
 int book_listbook (int argc, char **argv) {
 
-  int status;
   Book *book;
 
@@ -83 +83 @@
 int book_npages (int argc, char **argv) {
 
-  int N, status;
+  int N;
   Book *book;
   char *varName;

branches/dvo-mods-2007-02/Ohana/src/opihi/cmd.data/create.c

@@ -3 +3 @@
 int create (int argc, char **argv) {
   
-  int i, N;
+  int i;
   float start, end, delta;
   Vector *vec;

branches/dvo-mods-2007-02/Ohana/src/opihi/cmd.data/line.c

@@ -3 +3 @@
 int line (int argc, char **argv) {
   
-  int N, Npts;
   Graphdata graphmode;
   float x[2], y[2];

branches/dvo-mods-2007-02/Ohana/src/opihi/cmd.data/queueload.c

@@ -4 +4 @@
   
   char *A, *B, *val;
-  int i, done, status;
-  int N, Nread, Nbytes, NBYTES;
+  int i, status;
+  int Nread, Nbytes, NBYTES;
   FILE *f;
   Queue *queue;

branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/imbox.c

@@ -3 +3 @@
 int imbox (int argc, char **argv) {
   
-  int i, j, Nskip, status, InPic, flipped, Nextend;
+  int j, Nskip, status, InPic, flipped;
   Vector Xvec, Yvec;
   double r, d, x[4], y[4], Rmin, Rmax, Rmid;

branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/paverage.c

@@ -5 +5 @@
   
   FILE *f;
-  int i, j, k, m, Narg, Npts, NPTS, status, VERBOSE;
+  int i, j, Narg, Npts, NPTS, status, VERBOSE;
   int Nsecfilt, Nsec;
   double Mz, Mr, mag;
   double Radius, Rmin, Rmax, R, D;
   unsigned IDclip, IDchoice, LimExclude;
-  unsigned FlagChoice, FlagClip, flags;
   float *Xvec, *Yvec, *Zvec;
 

branches/dvo-mods-2007-02/Ohana/src/opihi/include/display.h

@@ -20 +20 @@
 int           PrepPlotting          PROTO((int Npts, Graphdata *graphmode));
 int           PlotVector            PROTO((int, float *));
+int           PlotVectorTriplet     PROTO((int N, float *xValues, float *yValues, float *zValues, Graphdata *graphmode));
 int           GetGraphData          PROTO((Graphdata *data, int *sock, int *N));
 int           GetGraph              PROTO((Graphdata *data, int *socket, int *N));

branches/dvo-mods-2007-02/Ohana/src/opihi/include/shell.h

@@ -72 +72 @@
 void          welcome                   PROTO(());
 
+int           add_listentry             PROTO((int ThisList, char *line));
 int           is_for_loop               PROTO((char *line));
 int           is_if_block               PROTO((char *line));

branches/dvo-mods-2007-02/Ohana/src/opihi/lib.data/book.c

@@ -38 +38 @@
 /* return the given book */
 Book *GetBook (int where) {
-
-  int i;
 
   if (where < 0) where += Nbooks;

branches/dvo-mods-2007-02/Ohana/src/opihi/lib.data/page.c

@@ -26 +26 @@
 /* return the given page */
 Page *GetPage (Book *book, int where) {
-
-  int i;
 
   if (where < 0) where += book[0].Npages;

branches/dvo-mods-2007-02/Ohana/src/opihi/lib.shell/ListOps.c

@@ -79 +79 @@
 
   int Nlines;
-  char *output;
 
   Nlines = lists[ThisList].Nlines;
@@ -108 +107 @@
 int is_macro_create (char *line) {
 
-  int i, N, status;
+  int status;
   char *comm;
   char *this_macro;

branches/dvo-mods-2007-02/Ohana/src/opihi/lib.shell/SocketOps.c

@@ -92 +92 @@
 int WaitServerSocket (int InitSocket, SockAddress *Address) {
 
-  int i, BindSocket, length;
+  int i, BindSocket;
   SockAddress Address_in;
+  socklen_t length;
   u_int32_t addr;
 

branches/dvo-mods-2007-02/Ohana/src/opihi/lib.shell/exec_loop.c

@@ -4 +4 @@
 
   void *Signal;
-  int n, Nlines, j, status, ThisList;
+  int j, status, ThisList;
   char *line;
   

branches/dvo-mods-2007-02/Ohana/src/opihi/lib.shell/opihi.c

@@ -7 +7 @@
   char *line, *prompt, *history;
   pid_t ppid;
-  FILE *log;
 
   general_init (&argc, argv);

branches/dvo-mods-2007-02/Ohana/src/opihi/lib.shell/version.c

@@ -1 +1 @@
 # include "shell.h"
-
-static char *unknown = "UNKNOWN";
 static char *name = "$Name: not supported by cvs2svn $";
 

branches/dvo-mods-2007-02/Ohana/src/opihi/pantasks/CheckTasks.c

@@ -6 +6 @@
   Task *task;
   int status;
-  struct timeval now;
+  // struct timeval now;
 
   /** test all tasks: ready to test? ready to run? **/

branches/dvo-mods-2007-02/Ohana/src/opihi/pantasks/TaskOps.c

@@ -149 +149 @@
 void ListTaskStats (char *regex) {
 
-  int i, j, valid, nameLength;
-  char *start, *stop;
+  int i, valid, nameLength;
   char format[128];
   regex_t preg;
@@ -557 +556 @@
   if (verbose) {
       fprintf (stderr, "tt: %d %6d  - %d %6d : %f\n", 
-               now.tv_sec, now.tv_usec, 
-               start.tv_sec, start.tv_usec, dtime);
+               (int) now.tv_sec, (int) now.tv_usec, 
+               (int) start.tv_sec, (int) start.tv_usec, dtime);
   }
 

branches/dvo-mods-2007-02/Ohana/src/opihi/pantasks/task_stdout.c

@@ -3 +3 @@
 int task_stdout (int argc, char **argv) {
 
-  int N, RequiredHost;
   Task *task;
 
@@ -27 +26 @@
 int task_stderr (int argc, char **argv) {
 
-  int N, RequiredHost;
   Task *task;