Merge branch 'master' into aweather

[~andy/rsl] / examples / qlook.c

diff --git a/examples/qlook.c b/examples/qlook.c
index f304da0482842abf94e2619b7be4dd8a65f4b55b..b8e6991311373713db087827c17aca5497ab9f6b 100644 (file)
--- a/examples/qlook.c
+++ b/examples/qlook.c
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <libgen.h>
-#define USE_RSL_VARS
 #include "rsl.h"
 
 #define ZDR_WIDTH 10
@@ -47,45 +46,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;
+    Radar       *radar     = NULL;
+    Volume      *dz_volume = NULL, *vr_volume = NULL;
+    Volume      *dr_volume = NULL, *zt_volume = NULL;
+    Volume      *sw_volume = NULL, *qc_volume = NULL;
 
-    Sweep       *sweep;
-    Sweep       *dz_sweep, *qc_sweep;
-    Sweep       *dr_sweep, *zt_sweep;
-    Sweep       *vr_sweep, *sw_sweep;
+    Sweep       *sweep     = NULL;
 
     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[3];
-    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 */
 
@@ -268,6 +260,7 @@ main(int argc, char **argv) {
             radar->h.year, radar->h.month, radar->h.day, 
             radar->h.hour, radar->h.minute);
 
+    if (radar->h.vcp > 0) printf("VCP %d\n", radar->h.vcp);
 /* 
    Print the radar/volume info.
 */
@@ -734,7 +727,7 @@ main(int argc, char **argv) {
 
     if(verbose)
         printf("Finished!\n");
-    exit (0);
 
+    return 0;
 } /* End of main */