From: Andy Spencer Date: Wed, 28 Oct 2009 01:37:37 +0000 (+0000) Subject: Fix compiler warnings X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;ds=sidebyside;h=5ed3a441cf557b8d5f366720be822ea2a2325014;p=~andy%2Frsl Fix compiler warnings --- diff --git a/africa.c b/africa.c index 7348587..693a7bd 100644 --- a/africa.c +++ b/africa.c @@ -22,6 +22,7 @@ */ #include #include +#include #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 b66b9a8..27de1ec 100644 --- a/dorade_to_radar.c +++ b/dorade_to_radar.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #define USE_RSL_VARS #include "rsl.h" diff --git a/examples/any_to_gif.c b/examples/any_to_gif.c index f598033..0ce222b 100644 --- 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 62293b1..42a41b4 100644 --- a/examples/any_to_ppm.c +++ b/examples/any_to_ppm.c @@ -9,11 +9,12 @@ * the RSL. * */ +#include #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 f2ab637..6cc6c3c 100644 --- a/examples/cappi_image.c +++ b/examples/cappi_image.c @@ -7,6 +7,7 @@ */ #include +#include #include #include "rsl.h" diff --git a/examples/dorade_main.c b/examples/dorade_main.c index 120dd14..c8e2076 100644 --- a/examples/dorade_main.c +++ b/examples/dorade_main.c @@ -1,4 +1,5 @@ #include +#include #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 139b231..dba5f14 100644 --- 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 65acfaa..5cf6011 100644 --- a/examples/kwaj_subtract_one_day.c +++ b/examples/kwaj_subtract_one_day.c @@ -1,3 +1,4 @@ +#include #include "rsl.h" /**********************************************************************/ diff --git a/examples/lassen_to_gif.c b/examples/lassen_to_gif.c index dd9a168..5815732 100644 --- 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 #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 0505fb8..bfc12e4 100644 --- a/examples/print_hash_table.c +++ b/examples/print_hash_table.c @@ -9,6 +9,7 @@ * */ +#include #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 6167c81..991ec75 100644 --- 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 5fa6c17..f8140e8 100644 --- 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 f1655ce..a152745 100644 --- a/examples/sector.c +++ b/examples/sector.c @@ -1,4 +1,5 @@ #include +#include #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 08969eb..ab486cf 100644 --- a/examples/wsr88d_to_gif.c +++ b/examples/wsr88d_to_gif.c @@ -14,9 +14,10 @@ * wsr88d_to_gif file [tape_header_file] */ +#include #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 3e5585e..a7ae48d 100644 --- a/lassen_to_radar.c +++ b/lassen_to_radar.c @@ -31,6 +31,7 @@ */ #include +#include #include #include #include diff --git a/rainbow.c b/rainbow.c index e8cedc1..49d8190 100644 --- a/rainbow.c +++ b/rainbow.c @@ -22,6 +22,7 @@ */ #include +#include #include #include "rsl.h" #include "rainbow.h" diff --git a/rainbow_to_radar.c b/rainbow_to_radar.c index 1bf5599..7887063 100644 --- a/rainbow_to_radar.c +++ b/rainbow_to_radar.c @@ -22,6 +22,7 @@ */ #include +#include #include #include "rsl.h" #include "rainbow.h" diff --git a/rapic.y b/rapic.y index e15def0..b104757 100644 --- 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 4373df3..3e764d9 100644 --- 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 +#include #include "rsl.h" #include "wsr88d.h"