diff --git a/inputs.cc b/inputs.cc index 409abe0..92312da 100644 --- a/inputs.cc +++ b/inputs.cc @@ -1297,7 +1297,7 @@ int LoadLossColors(struct site xmtr) return 0; } -void LoadDBMColors(struct site xmtr) +int LoadDBMColors(struct site xmtr) { int x, y, ok, val[4]; char filename[255], string[80], *pointer = NULL, *s = NULL; @@ -1397,14 +1397,13 @@ void LoadDBMColors(struct site xmtr) region.levels = 16; - fd = fopen(filename, "r"); - - if (fd == NULL && xmtr.filename[0] == '\0') + if ( (fd = fopen(filename, "r")) == NULL && xmtr.filename[0] == '\0' ) /* Don't save if we don't have an output file */ - return; + return 0; if (fd == NULL) { - fd = fopen(filename, "w"); + if( (fd = fopen(filename, "w")) == NULL ) + return errno; for (x = 0; x < region.levels; x++) fprintf(fd, "%+4d: %3d, %3d, %3d\n", region.level[x], @@ -1456,6 +1455,7 @@ void LoadDBMColors(struct site xmtr) fclose(fd); region.levels = x; } + return 0; } void LoadTopoData(int max_lon, int min_lon, int max_lat, int min_lat) diff --git a/inputs.hh b/inputs.hh index f216b65..d15a87c 100644 --- a/inputs.hh +++ b/inputs.hh @@ -8,7 +8,7 @@ char LoadSDF(char *name, int winfiles); int LoadPAT(char *az_filename, char *el_filename); int LoadSignalColors(struct site xmtr); int LoadLossColors(struct site xmtr); -void LoadDBMColors(struct site xmtr); +int LoadDBMColors(struct site xmtr); void LoadTopoData(int max_lon, int min_lon, int max_lat, int min_lat); void LoadUDT(char *filename); int loadLIDAR(char *filename); diff --git a/outputs.cc b/outputs.cc index 43b2fa9..70e38e9 100644 --- a/outputs.cc +++ b/outputs.cc @@ -528,7 +528,7 @@ void DoRxdPwr(char *filename, unsigned char geo, unsigned char kml, image_ctx_t ctx; int success; - if((success = image_init(&ctx, width, (kml ? height : height + 30), IMAGE_RGB, IMAGE_DEFAULT)) != 0){ + if( (success = image_init(&ctx, width, (kml ? height : height + 30), IMAGE_RGB, IMAGE_DEFAULT)) != 0 ){ fprintf(stderr,"Error initializing image\n"); exit(success); } @@ -538,7 +538,10 @@ void DoRxdPwr(char *filename, unsigned char geo, unsigned char kml, 255.0 / pow((double)(max_elevation - min_elevation), one_over_gamma); - LoadDBMColors(xmtr[0]); + if( (success = LoadDBMColors(xmtr[0])) != 0 ){ + fprintf(stderr,"Error loading DBM colors\n"); + exit(success); + } if( filename != NULL ) {