Fix more errors

- Add return types
- Remove unused variables

diff --git a/examples/Makefile.am b/examples/Makefile.am
index abe407e509a5f01b6dc2cc2454d1adcb8fa1e3c6..6fcfdc503572e3f9ac43502f8a07da34f81242fd 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,5 @@
 LIBS = $(top_srcdir)/src/librsl.la
+AM_CFLAGS = -I$(top_srcdir)/src
 
 bin_PROGRAMS = any_to_gif any_to_uf qlook
 

diff --git a/examples/any_to_gif.c b/examples/any_to_gif.c
index 0ce222b27e362ad4d0d1336bbaeac77fdbf5c6db..7493029364379efe1f7181ab490bb2f79b3ffe60 100644 (file)
--- a/examples/any_to_gif.c
+++ b/examples/any_to_gif.c
@@ -43,7 +43,7 @@ int usage(char **argv)
   fprintf(stderr, "       -b x = Make black for dbz below x. Default = 0 (no action).\n");
   exit(-1);
 }
-process_args(int argc, char **argv,
+void process_args(int argc, char **argv,
                         char **in_file, char **callid, int *verbose, int *wholevolume,
                         int *xdim, float *range, int *dbz_black)
 {

diff --git a/examples/any_to_uf.c b/examples/any_to_uf.c
index eecca35ab41def6ff515bce3f0381c1dc9da0108..754aba90f4ce0b7522aa1db6f9a330f1c323f927 100644 (file)
--- a/examples/any_to_uf.c
+++ b/examples/any_to_uf.c
@@ -12,7 +12,7 @@ void usage(char **argv)
   exit(-1);
 }
 
-process_args(int argc, char **argv,
+void process_args(int argc, char **argv,
                         char **in_file, char **out_file, char **first_file)
 {
   int c;
@@ -35,7 +35,7 @@ process_args(int argc, char **argv,
 }
 
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 
   Radar *radar;
@@ -46,7 +46,7 @@ main (int argc, char **argv)
   RSL_radar_verbose_on();
   radar = RSL_anyformat_to_radar(infile, first_file);
   RSL_radar_to_uf(radar, outfile);
-
+  return 0;
 }
 
   

diff --git a/examples/any_to_ufgz.c b/examples/any_to_ufgz.c
index cd8af70e47e430134026f5b6a5d57593d8cf7470..f01649e361020cf1f60f85bea5e210ae048e7821 100644 (file)
--- a/examples/any_to_ufgz.c
+++ b/examples/any_to_ufgz.c
@@ -12,7 +12,7 @@ void usage(char **argv)
   exit(-1);
 }
 
-process_args(int argc, char **argv,
+void process_args(int argc, char **argv,
                         char **in_file, char **out_file, char **first_file)
 {
   int c;
@@ -35,7 +35,7 @@ process_args(int argc, char **argv,
 }
 
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 
   Radar *radar;
@@ -46,7 +46,7 @@ main (int argc, char **argv)
 
   radar = RSL_anyformat_to_radar(infile, first_file);
   RSL_radar_to_uf_gzip(radar, outfile);
-
+  return 0;
 }
 
   

diff --git a/examples/bscan.c b/examples/bscan.c
index 7f4dd415a547e7a9f48e45a8b464413f937ec949..62d58546fcff15fbc1506d2c4436f87cf3468dee 100644 (file)
--- a/examples/bscan.c
+++ b/examples/bscan.c
@@ -17,13 +17,13 @@
 
 #include "rsl.h"
 
-usage()
+void usage()
 {
   fprintf(stderr,"Usage: bscan infile [callid]\n");
   exit(-1);
 }
 
-process_args(int argc, char **argv,
+void process_args(int argc, char **argv,
                         char **in_file, char **callid)
 {
  
@@ -38,12 +38,11 @@ process_args(int argc, char **argv,
 }
 
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   char *infile, *callid;
 
   Radar *radar;
-  Volume *cappi_vol;
   char *index_str[] = {"DZ", "VR", "SW"};
 
   int i;
@@ -83,6 +82,5 @@ main(int argc, char **argv)
   RSL_bscan_volume((Volume *) radar->v[i], "bscan.ppm");
   printf("----> BSCAN complete.\n");
 
-  exit(0);
-
+  return 0;
 }

diff --git a/examples/cappi_image.c b/examples/cappi_image.c
index 6cc6c3caef9031316764365cf7ac9391a367a69a..32ad7701f751da8dab1eb57d295e6eea2cc3d32f 100644 (file)
--- a/examples/cappi_image.c
+++ b/examples/cappi_image.c
@@ -11,13 +11,13 @@
 #include <string.h>
 #include "rsl.h"
 
-usage(int argc, char **argv)
+void usage(int argc, char **argv)
 {
   fprintf(stderr,"Usage: %s infile [firstfile | callid]\n", argv[0]);
   exit(-1);
 }
 
-process_args(int argc, char **argv,
+void process_args(int argc, char **argv,
                         char **in_file, char **out_file)
 {
  
@@ -33,7 +33,7 @@ process_args(int argc, char **argv,
 }
 
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   char *infile, *firstfile;
   char outfile[100];
@@ -77,7 +77,5 @@ main(int argc, char **argv)
        RSL_free_cappi(cappi);
   }
 
-
-  exit(0);
-
+  return 0;
 }

diff --git a/examples/killer_sweep.c b/examples/killer_sweep.c
index dba5f14f30fb30a6ca773a24a1b584f1bf91faaa..d70766c84a347c1b4b0f96901e284fc310b87c7f 100644 (file)
--- a/examples/killer_sweep.c
+++ b/examples/killer_sweep.c
@@ -42,6 +42,7 @@ void print_hash_table (Sweep *s)
   Azimuth_hash *index;
   float azim;
   float res;
+  int SWEEP_INDEX(Sweep *s); // From Volume.c
 
   if (s == NULL) return;
   sweep_index = SWEEP_INDEX(s);

diff --git a/examples/kwaj_subtract_one_day.c b/examples/kwaj_subtract_one_day.c
index 5cf60111c50b9937a60572c9d3549101372e9d36..f35497865f78719af3f8df8b529302ad3a51cde5 100644 (file)
--- a/examples/kwaj_subtract_one_day.c
+++ b/examples/kwaj_subtract_one_day.c
@@ -21,8 +21,8 @@ void usage(char **argv)
 /*                                                                    */
 /**********************************************************************/
 #include<time.h>
-void    *subtract_one_day(int month, int day, int year,
-                                                 int *m, int *d, int *y)
+void subtract_one_day(int month, int day, int year,
+       int *m, int *d, int *y)
 {
   /* Connocialize and subtract. */
   struct tm *t;
@@ -37,7 +37,6 @@ void    *subtract_one_day(int month, int day, int year,
   *m = t->tm_mon+1;
   *d = t->tm_mday;
   *y = t->tm_year+1900;
-  return;
 }
 
 /**********************************************************************/

diff --git a/examples/print_hash_table.c b/examples/print_hash_table.c
index bfc12e406a5d058b4457936dc53b5074db549a6c..33537b24b2f5fb27d31a7acccf89e7c6dbf41630 100644 (file)
--- a/examples/print_hash_table.c
+++ b/examples/print_hash_table.c
@@ -48,6 +48,7 @@ void print_hash_table (Sweep *s)
   Azimuth_hash *index;
   float azim;
   float res;
+  int SWEEP_INDEX(Sweep *s); // From Volume.c
 
   if (s == NULL) return;
   sweep_index = SWEEP_INDEX(s);

diff --git a/examples/print_header_info.c b/examples/print_header_info.c
index 991ec75b72bf2ed797e9e2b3d9b2c28ac6579136..c5084161b598ba247355794c3166df4c8246d9c8 100644 (file)
--- a/examples/print_header_info.c
+++ b/examples/print_header_info.c
@@ -8,13 +8,13 @@
 
 int qprint_ray;
 
-usage(char **argv)
+void usage(char **argv)
 {
   fprintf(stderr,"Usage: %s [-v] [-f nexrad_id] [infile]\n", argv[0]);
   exit(-1);
 }
 
-process_args(int argc, char **argv,
+void process_args(int argc, char **argv,
                         char **in_file, int *qprint_ray,
                         char **site)
 {
@@ -120,7 +120,7 @@ void print_header_for_volume(Volume *v)
 }
 
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   char *infile;
 
@@ -183,6 +183,6 @@ for (i=0; i<radar->h.nvolumes; i++) {
        print_header_for_volume(radar->v[i]);
   }
 }
-exit(0);
 
+return 0;
 }

diff --git a/examples/qlook.c b/examples/qlook.c
index f8140e83436c4d04ab7039bd5a1c385ac2a7d8e9..f3a2081411cb65e03f1ae52017fe5c78cff73db2 100644 (file)
--- a/examples/qlook.c
+++ b/examples/qlook.c
@@ -47,45 +47,38 @@ void make_pathname(char *filename, char *dir, char *pathname)
 /***********************************************************************/
 /*** DBW ***************************************************************/
 /***********************************************************************/
-main(int argc, char **argv) {
+int main(int argc, char **argv) {
 
     Radar       *radar;
     Volume      *dz_volume, *vr_volume;
     Volume      *dr_volume, *zt_volume;
-    Volume      *sw_volume, *qc_volume, *volume;
+    Volume      *sw_volume, *qc_volume;
 
     Sweep       *sweep;
-    Sweep       *dz_sweep, *qc_sweep;
-    Sweep       *dr_sweep, *zt_sweep;
-    Sweep       *vr_sweep, *sw_sweep;
 
     Ray         *ray;
-    int         reflectivity, qc_reflectivity, nvolumes;
+    int         reflectivity, qc_reflectivity;
     int         differential_reflectivity, total_reflectivity;
     int         velocity, spectral_width;
     int         make_catalog, make_gif, make_pgm; 
     int         make_uf, make_bscan;
     int         xdim, ydim, num_sweeps;
-    int         i,j,k,l,n, verbose, kk;
-    int         month, day, year, hour, min;
+    int         i,j, verbose;
     int         ncbins, width;
     int         print_azim;
     float       scale, dbz_offset;
     float       latitude, longitude;
 
-    float       sec;
     float       maxr;
-    float       nyquist, max_range, gate_size_adjustment;
+    float       max_range, gate_size_adjustment;
 
     char        tape_id[100];
     char        in_file[100], site_id[100];
-    char        filename[100], outfile[100], nexfile[100];
-    char        command[100], file_prefix[100], file_suffix[10];
-    char        dir_string[100], red[120], grn[120], blu[120];
-    char        time_string[14], site_string[10],img_base[20];
+    char        filename[100];
+    char        file_suffix[10];
+    char        time_string[14];
     char        pathname[256], gifdir[100], pgmdir[100], ufdir[100];
     char        *inpath;
-    FILE        *fp;
 
 /* Set default values */
 
@@ -735,7 +728,7 @@ main(int argc, char **argv) {
 
     if(verbose)
         printf("Finished!\n");
-    exit (0);
 
+    return 0;
 } /* End of main */
 

diff --git a/examples/sector.c b/examples/sector.c
index a1527457c5adbf0bb38649bb6610104acb1f1950..017340b9c7b24e03b489b0b8636d0348d21ea760 100644 (file)
--- a/examples/sector.c
+++ b/examples/sector.c
@@ -39,6 +39,7 @@ void print_hash_table (Sweep *s)
   Azimuth_hash *index;
   float azim;
   float res;
+  int SWEEP_INDEX(Sweep *s); // From Volume.c
 
   if (s == NULL) return;
   sweep_index = SWEEP_INDEX(s);
@@ -60,7 +61,6 @@ Sweep * get_sector(Sweep *s, float lo_azimuth, float hi_azimuth)
 {
   int   i, j;
   Sweep *new_sweep;
-  Ray   *saved_ray;
 
   if (s == NULL) return NULL;
 

diff --git a/examples/test_get_win.c b/examples/test_get_win.c
index f01b8ccab46d53a096dced9905e2e51f47bf641b..4dcc6433729b721a3ff314f8bf404c4ebd8e31d3 100644 (file)
--- a/examples/test_get_win.c
+++ b/examples/test_get_win.c
@@ -30,7 +30,7 @@ Sweep *load_sweep(Sweep *s)
 }
 
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 
   Radar *new_radar, *tmp_radar, *radar;
@@ -122,7 +122,7 @@ main (int argc, char **argv)
   }
   RSL_free_radar(radar);
   printf("done\n");
-  exit (0);
 
+  return 0;
 }
 

diff --git a/examples/wsr_hist_uf_test.c b/examples/wsr_hist_uf_test.c
index c7b129ae054202b0eeba22370389c9caeb7a1135..80849d259a116b8c762c8519d349dc9b9d251a09 100644 (file)
--- a/examples/wsr_hist_uf_test.c
+++ b/examples/wsr_hist_uf_test.c
@@ -25,13 +25,13 @@
 #include "rsl.h"
 
 
-usage()
+void usage()
 {
   fprintf(stderr,"Usage: wsr_hist_uf_test infile [-s site_id]\n");
   exit(-1);
 }
 
-process_args(int argc, char **argv, char **in_file, char **site)
+void process_args(int argc, char **argv, char **in_file, char **site)
 {
   int c;
   
@@ -46,7 +46,7 @@ process_args(int argc, char **argv, char **in_file, char **site)
 }
 
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   char *infile;
   char *site = NULL;
@@ -91,6 +91,5 @@ main(int argc, char **argv)
                                                                                 histogram, -30, 70, 0, 200);
   RSL_print_histogram(histogram, 0, 200, "hist_uf_to_radar.dat");
 
-  exit(0);
-
+  return 0;
 }

diff --git a/gen.sh b/gen.sh
index 1452bec576efa966238c472c153d0d6aa5a8153e..ad65a167511ad52cbd18f622fea6ffcb12fea609 100755 (executable)
--- a/gen.sh
+++ b/gen.sh
@@ -2,4 +2,4 @@
 ./autogen.sh \
        --enable-shared \
        --disable-static \
-       CFLAGS="-g -Wall -Wno-unused -O3"
+       CFLAGS="-g -Wall -O3"

diff --git a/src/dorade_to_radar.c b/src/dorade_to_radar.c
index 27de1ece0827681b9818c25fb2a2b6ec2f143416..4af897a856bd08185c46b9a6c50bf4ace9ff2199 100644 (file)
--- a/src/dorade_to_radar.c
+++ b/src/dorade_to_radar.c
@@ -161,9 +161,6 @@ Radar *RSL_dorade_to_radar(char *infile)
   int datum, missing_data_flag;
   float prf;
 
-  float (*f)(Range x);
-  Range (*invf)(float x);
-
   FILE  *fp;
   Comment_block   *cb;
   Volume_desc     *vd;

diff --git a/src/nsig.c b/src/nsig.c
index 7e5c3c1281d60ffd719e11d5824a97a1c4412a2d..c00b5ed44257065c2c072c8610aff04a22bb5fb6 100644 (file)
--- a/src/nsig.c
+++ b/src/nsig.c
@@ -391,12 +391,15 @@ NSIG_Ray *nsig_read_ray(FILE *fp)
 NSIG_Sweep **nsig_read_sweep(FILE *fp, NSIG_Product_file *prod_file)
 {
   NSIG_Sweep **s;
-  int i, j, n;
+  int i, n;
   static NSIG_Ingest_data_header **idh = NULL;
   static NSIG_Raw_prod_bhdr *bhdr = NULL;
   NSIG_Ray *nsig_ray;
   int data_mask, iray, nrays[12], max_rays;
+#ifdef NSIG_VER2
+  int j;
   int masks[5];
+#endif
   int nparams;
   int is_new_ray;
   int idtype[12];

diff --git a/src/nsig_to_radar.c b/src/nsig_to_radar.c
index 88788e46dba3b2ff6ae1e6535ae5cd0686cfadfa..b956173fb2ca11dad108974e3b20e786f2fcf7f9 100644 (file)
--- a/src/nsig_to_radar.c
+++ b/src/nsig_to_radar.c
@@ -181,7 +181,9 @@ RSL_nsig_to_radar
   NSIG_Product_file *prod_file;
   short id;
   int data_mask, nrays;
+#ifdef NSIG_VER2 
   int masks[5];
+#endif
   int nparams, nsweeps;
   NSIG_Sweep **nsig_sweep;
   NSIG_Ray *ray_p;

diff --git a/src/radar_to_uf.c b/src/radar_to_uf.c
index 5b7e499b891421dc628cf535631b35151a4def81..a2acc74d025e0fe0524dd173046950f98ba3b358 100644 (file)
--- a/src/radar_to_uf.c
+++ b/src/radar_to_uf.c
@@ -210,9 +210,10 @@ void RSL_radar_to_uf_fp(Radar *r, FILE *fp)
     ray_num = 0;
   if (radar_verbose_flag) 
     fprintf(stderr,"Processing sweep %d for %d rays.", i, nrays);
-  if (radar_verbose_flag)
+  if (radar_verbose_flag) {
     if (little_endian()) fprintf(stderr," ... On Little endian.\n");
     else fprintf(stderr,"\n");
+  }
 
 
 /* Now LOOP for all rays within this particular sweep (i).

diff --git a/src/rainbow.c b/src/rainbow.c
index 49d81908a1b804df40ea57b6d072fa2c8f6748f4..7d5862c00f525cfc2fe1eba141c3b9d9046421ba 100644 (file)
--- a/src/rainbow.c
+++ b/src/rainbow.c
@@ -158,7 +158,6 @@ void W_label(Rainbow_hdr *rainbow_hdr, char* buf)
     int labelnum, az_start, az_stop, pw_code, prf_high, prf_low, zdata;
     int vdata, wdata, unfolding, cdata, ddata, uzdata;
     float elev, az_step, az_rate, range_stop;
-    char label;
 
     sscanf(buf, "%*c%d : %f %d %d %f %f %d %d %d %d %d %d %d %f %d %d %d",
            &labelnum, &elev, &az_start, &az_stop, &az_step,

diff --git a/src/rainbow_to_radar.c b/src/rainbow_to_radar.c
index 409ecdf26c8c88b6a11a4f77728b7ba657b29a96..5dc0a28269081c3f9a0010cdcffe3d5e07aa0780 100644 (file)
--- a/src/rainbow_to_radar.c
+++ b/src/rainbow_to_radar.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "rsl.h"
 #include "rainbow.h"
 
@@ -74,6 +75,8 @@ Radar *RSL_rainbow_to_radar(char *infile)
     Rainbow_hdr rainbow_hdr;
     struct dms latdms, londms;
 
+    void read_rainbow_header(Rainbow_hdr *, FILE *);
+
     /* These next lines allow program to read from a regular file, a
      * compressed file, or standard input.  I lifted them from RSL_uf_to_radar
      * by John Merritt.
@@ -175,13 +178,14 @@ int rainbow_data_to_radar(Radar *radar, Rainbow_hdr rainbow_hdr, FILE *fp)
      * and sweeps continues for the remainder of sweeps in the volume scan.
      */
 
-    int iray, isweep, nread, nsweeps, nrays, nbins, vol_index;
+    int iray, isweep, nread, nsweeps, nrays, nbins;
     unsigned char *rainbow_ray;
     Volume *v;
     Sweep *sweep;
     Ray *ray;
     int i;
     float azim_rate, beam_width, dz, elev_angle, prf, unam_rng;
+    int vol_index = VR_INDEX;
 
     beam_width = 1.0; /* for now */
 
@@ -227,7 +231,7 @@ int rainbow_data_to_radar(Radar *radar, Rainbow_hdr rainbow_hdr, FILE *fp)
        fprintf(stderr,"WARNING: number of rays computed is not the number "
                "expected.\n");
        fprintf(stderr,"Computed = nrays: "
-           "azstart = %d, az_stop = %d, az_step = %%f\n",
+           "azstart = %d, az_stop = %d, az_step = %f\n",
            rainbow_hdr.az_start, rainbow_hdr.az_stop, rainbow_hdr.az_step);
        fprintf(stderr,"Expected 360\n");
     }

diff --git a/src/rapic_scan.l b/src/rapic_scan.l
index adbac8834347a19d3ec0d288adabb9be66c6ea1d..002aacd6874b614340b55e977b73757dc27f7a3e 100644 (file)
--- a/src/rapic_scan.l
+++ b/src/rapic_scan.l
@@ -42,7 +42,8 @@
 
 %}
 
-
+%option nounput
+%option noinput
 %x ATMODE
 
 %%

diff --git a/src/wsr88d_m31.c b/src/wsr88d_m31.c
index 015b1cc09271d5a4f81d860eb9a16a4f57038aab..cc912ba6ae27e496a4fa61297e4f87629320bb84 100644 (file)
--- a/src/wsr88d_m31.c
+++ b/src/wsr88d_m31.c
@@ -391,13 +391,13 @@ void wsr88d_load_ray(Wsr88d_ray_m31 *wsr88d_ray,
     /* Load data into ray structure for this field or data moment. */
 
     int ngates;
-    int i, hdr_size;
+    int i;
     float value, scale, offset;
-    Range (*invf)(float x);
-    float (*f)(Range x);
     Ray *ray;
     int vol_index, waveform;
-    char *type_str;
+    Range (*invf)(float x) = DZ_INVF;
+    float (*f)(Range x) = DZ_F;
+    char *type_str = "Unknown Type";
 
     enum waveforms {surveillance=1, doppler_w_amb_res, doppler_no_amb_res,
        batch};

diff --git a/src/wsr88d_to_radar.c b/src/wsr88d_to_radar.c
index 0ea067219429969864605de1575a88b037f46206..b6bb0989d174ab2c1647e0f3067c626ade0effd2 100644 (file)
--- a/src/wsr88d_to_radar.c
+++ b/src/wsr88d_to_radar.c
@@ -321,7 +321,6 @@ Radar *RSL_wsr88d_to_radar(char *infile, char *call_or_first_tape_file)
          fprintf(stderr,"Archive II header contains unknown version "
                  ": '%s'\n", version);
       wsr88d_close(wf);
-      free(radar);
       return NULL;
   }