Fix compiler warnings

diff --git a/africa.c b/africa.c
index 7348587ed0c4eee7b14350069baca71f34932650..693a7bdc71f4654bd8274283baa10f346a09435b 100644 (file)
--- a/africa.c
+++ b/africa.c
@@ -22,6 +22,7 @@
 */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "africa.h"
 
 int africa_read_buffer(FILE *fp, Africa_buffer *buffer)

diff --git a/dorade_to_radar.c b/dorade_to_radar.c
index b66b9a8beb85adf627ec5383e71bd03116f0b0d0..27de1ece0827681b9818c25fb2a2b6ec2f143416 100644 (file)
--- a/dorade_to_radar.c
+++ b/dorade_to_radar.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <strings.h>
 #include <string.h>
 #define USE_RSL_VARS
 #include "rsl.h"

diff --git a/examples/any_to_gif.c b/examples/any_to_gif.c
index f5980334d687f8d9f43ea30a13df3c8204dbb8cc..0ce222b27e362ad4d0d1336bbaeac77fdbf5c6db 100644 (file)
--- a/examples/any_to_gif.c
+++ b/examples/any_to_gif.c
@@ -73,7 +73,7 @@ process_args(int argc, char **argv,
 }
 
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   Radar *radar;
   Sweep *sweep;

diff --git a/examples/any_to_ppm.c b/examples/any_to_ppm.c
index 62293b19e5c3a994ae5a0bb06b57357e29b5120f..42a41b44d5a5c3c44984892528bec906933bfa00 100644 (file)
--- a/examples/any_to_ppm.c
+++ b/examples/any_to_ppm.c
@@ -9,11 +9,12 @@
  * the RSL.
  *
  */
+#include <stdlib.h>
 
 #define USE_RSL_VARS
 #include "rsl.h"
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   Radar *radar;
   Sweep *sweep;

diff --git a/examples/cappi_image.c b/examples/cappi_image.c
index f2ab63791d78ad705199ff09f3e6d6eb52534aef..6cc6c3caef9031316764365cf7ac9391a367a69a 100644 (file)
--- a/examples/cappi_image.c
+++ b/examples/cappi_image.c
@@ -7,6 +7,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "rsl.h"
 

diff --git a/examples/dorade_main.c b/examples/dorade_main.c
index 120dd14db0a5b7588b03befc8147f686b2e9cc53..c8e2076732f91f65613c985598dd9d55c12d11f0 100644 (file)
--- a/examples/dorade_main.c
+++ b/examples/dorade_main.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include "rsl.h"
 
 int main(int argc, char **argv)
@@ -15,7 +16,7 @@ int main(int argc, char **argv)
   if (radar == NULL) 
        printf("radar == NULL\n");
   else
-       printf("radar == %x\n", radar);
+       printf("radar == %x\n", (unsigned int)radar);
 
   exit(0);
 }

diff --git a/examples/killer_sweep.c b/examples/killer_sweep.c
index 139b231efbd790fae3150a546c58b6f134f89775..dba5f14f30fb30a6ca773a24a1b584f1bf91faaa 100644 (file)
--- a/examples/killer_sweep.c
+++ b/examples/killer_sweep.c
@@ -146,7 +146,7 @@ void chase_hi_links(Sweep *sweep)
   }
 }
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   Radar *radar;
   Sweep *sweep;

diff --git a/examples/kwaj_subtract_one_day.c b/examples/kwaj_subtract_one_day.c
index 65acfaa07705c693980d2e5ae0b05e21fc611991..5cf60111c50b9937a60572c9d3549101372e9d36 100644 (file)
--- a/examples/kwaj_subtract_one_day.c
+++ b/examples/kwaj_subtract_one_day.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include "rsl.h"
 
 /**********************************************************************/

diff --git a/examples/lassen_to_gif.c b/examples/lassen_to_gif.c
index dd9a168a804bf5a661f167c28942e4fa24ebb241..581573208d1c5a1499f16f3773119a46fbc48230 100644 (file)
--- a/examples/lassen_to_gif.c
+++ b/examples/lassen_to_gif.c
@@ -4,9 +4,10 @@
  * This program can read the file from stdin.
  */
 
+#include <stdlib.h>
 #include "rsl.h"
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   Radar *radar;
 

diff --git a/examples/print_hash_table.c b/examples/print_hash_table.c
index 0505fb8c36332643b29466e1d0f2ada3431d9074..bfc12e406a5d058b4457936dc53b5074db549a6c 100644 (file)
--- a/examples/print_hash_table.c
+++ b/examples/print_hash_table.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <stdlib.h>
 #include "rsl.h"
 
 void print_link_list(Azimuth_hash *list)
@@ -87,7 +88,7 @@ void poke_about_sweep(Sweep *s)
 }
 
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   Radar *radar;
   Sweep *sweep;

diff --git a/examples/print_header_info.c b/examples/print_header_info.c
index 6167c81da033e854990c04be97c5e1e0a601d5f1..991ec75b72bf2ed797e9e2b3d9b2c28ac6579136 100644 (file)
--- a/examples/print_header_info.c
+++ b/examples/print_header_info.c
@@ -77,10 +77,10 @@ printf("  gate_size %d\n",   ray->h.gate_size);  /* Data gate size (meters)*/
 printf("    vel_res %f\n",  ray->h.vel_res);    /* Doppler velocity resolution */
 printf(" sweep_rate %f\n", ray->h.sweep_rate);   /* Sweep rate. Full sweeps/min. */
   
-printf("        prf %f\n", ray->h.prf);          /* Pulse repitition frequency, in Hz. */
+printf("        prf %d\n", ray->h.prf);          /* Pulse repitition frequency, in Hz. */
 printf("  azim_rate %f\n", ray->h.azim_rate);
 printf("  fix_angle %f\n", ray->h.fix_angle);
-printf("pulse_count %f\n", ray->h.pulse_count);
+printf("pulse_count %d\n", ray->h.pulse_count);
 printf("pulse_width %f\n", ray->h.pulse_width); /* Pulse width (micro-sec). */
 printf(" beam_width %f\n", ray->h.beam_width);  /* Beamwidth in degrees. */
 printf("  frequency %f\n", ray->h.frequency);   /* Bandwidth MHz. */

diff --git a/examples/qlook.c b/examples/qlook.c
index 5fa6c17d81e3ab65341926ba7fe9878163caca23..f8140e83436c4d04ab7039bd5a1c385ac2a7d8e9 100644 (file)
--- a/examples/qlook.c
+++ b/examples/qlook.c
@@ -32,7 +32,7 @@ void make_pathname(char *filename, char *dir, char *pathname)
 {
     /* Make pathname by combining directory name, if given, with filename. */
 
-    if (*dir == NULL) {
+    if (!dir || !dir[0]) {
         strcpy(pathname, filename);
     }
     else {
@@ -80,7 +80,7 @@ main(int argc, char **argv) {
     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        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        pathname[256], gifdir[100], pgmdir[100], ufdir[100];
@@ -598,7 +598,7 @@ main(int argc, char **argv) {
         scale = 0.5;
         ncbins = 21;
         width = 10;
-        printf("Calling RSL_rebin, %d %d %.2f\n", width);
+        printf("Calling RSL_rebin, %d\n", width);
         RSL_rebin_volume(dr_volume, width);
         if(verbose) printf("Loading zdr colortable...\n");
         RSL_load_zdr_color_table(); 

diff --git a/examples/sector.c b/examples/sector.c
index f1655ce6dd1db0647ddcc548df37b04aaab0a4a2..a1527457c5adbf0bb38649bb6610104acb1f1950 100644 (file)
--- a/examples/sector.c
+++ b/examples/sector.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include "rsl.h"
 
 /*
@@ -84,7 +85,7 @@ Sweep * get_sector(Sweep *s, float lo_azimuth, float hi_azimuth)
 }
 
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   Radar *radar;
   Sweep *sector;

diff --git a/examples/wsr88d_to_gif.c b/examples/wsr88d_to_gif.c
index 08969eb2b8959b1dd116a988cd6c0a7ba00d6e59..ab486cf243de2c4e74a84b3b4e4e8b711240c228 100644 (file)
--- a/examples/wsr88d_to_gif.c
+++ b/examples/wsr88d_to_gif.c
@@ -14,9 +14,10 @@
  * wsr88d_to_gif file [tape_header_file]
  */
 
+#include <stdlib.h>
 #include "rsl.h"
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
   Radar *radar;
 

diff --git a/lassen_to_radar.c b/lassen_to_radar.c
index 3e5585e2636a1c847118e983e310162c633a6a2e..a7ae48dfbe81dce08a842f5727fb9551c688bf64 100644 (file)
--- a/lassen_to_radar.c
+++ b/lassen_to_radar.c
@@ -31,6 +31,7 @@
 
 */
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <math.h>

diff --git a/rainbow.c b/rainbow.c
index e8cedc1c9db385f146aaaba059ed26a4e6afde17..49d81908a1b804df40ea57b6d072fa2c8f6748f4 100644 (file)
--- a/rainbow.c
+++ b/rainbow.c
@@ -22,6 +22,7 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "rsl.h"
 #include "rainbow.h"

diff --git a/rainbow_to_radar.c b/rainbow_to_radar.c
index 1bf559940703abde8471ad480938e90d24ed6d36..7887063038cf23e4b3ae08f5e159b6f95b3c6bb0 100644 (file)
--- a/rainbow_to_radar.c
+++ b/rainbow_to_radar.c
@@ -22,6 +22,7 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "rsl.h"
 #include "rainbow.h"

diff --git a/rapic.y b/rapic.y
index e15def070df8d30836d1697560b3a248b68a640b..b10475702322bc9e593b5c22a8b27fa64ab25413 100644 (file)
--- a/rapic.y
+++ b/rapic.y
@@ -463,7 +463,7 @@ ray : RAYDATA
    RSL_ftype[0] = RSL_ftype[0];
 
    /* Use yylval.token.s and yylval.token.len */
-   memset(outbuf, sizeof(outbuf), '\0');
+   memset(outbuf, '\0', sizeof(outbuf));
    rapic_decode((unsigned char *)yylval.token.s, yylval.token.len, outbuf, &outbytes,
                                &azim, &elev, &delta_time);
    /*   fprintf(stderr, "RAYDATA: ray %d, ivol %d, isweep %d, azim %f, elev %f, dtime %d, size=%d\n", nray, ivolume, isweep, azim, elev, delta_time, outbytes); */

diff --git a/wsr88d_m31.c b/wsr88d_m31.c
index 4373df3220f8033fa034f4056581cd0a9bed7891..3e764d9ddc2cd83ae99a22756195abcf798e3de8 100644 (file)
--- a/wsr88d_m31.c
+++ b/wsr88d_m31.c
@@ -25,6 +25,8 @@
  * This file contains routines for processing Message Type 31, the digital
  * radar message type introduced in WSR-88D Level II Build 10.
  */
+#include <stdlib.h>
+#include <string.h>
 
 #include "rsl.h"
 #include "wsr88d.h"