HFNOC/Signal-Server
2
0
Fork 0
forked from ExternalVendorCode/Signal-Server
Code Pull Requests Activity

Minor bugfix in gzip decoder

Browse Source
This commit is contained in:
N9OZB
2019-07-30 04:03:43 -05:00
parent 4065603692
commit 1c365dd6f9
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,5 +1,8 @@
SIGNAL SERVER CHANGELOG SIGNAL SERVER CHANGELOG
3.21 Beta - 30 Jul 2019 - N9OZB Mods, minor fix
Fixed a minor bug in the Gzip decoding routines, gzerror() not coming back NULL?
3.20 Beta - 14 Jul 2019 - N9OZB Mods 3.20 Beta - 14 Jul 2019 - N9OZB Mods
1. Added .GZ (Gzip) file processing for .sdf.gz DEM tiles. 1. Added .GZ (Gzip) file processing for .sdf.gz DEM tiles.
2. Added .BZ2 (Bzip2) file processing for .sdf.bz2 DEM tiles. 2. Added .BZ2 (Bzip2) file processing for .sdf.bz2 DEM tiles.

8
src/inputs.cc
View File

@@ -1002,8 +1002,8 @@ char *GZfgets(char *output, gzFile gzfd, unsigned length)
} }
} }
if (debug && errmsg != NULL) { if (debug && (errmsg != NULL) && (gzerr != Z_OK && gzerr != Z_STREAM_END)) {
fprintf(stderr, "GZfgets: errmsg = [%s]\n", errmsg); fprintf(stderr, "GZfgets: gzerr = %d, errmsg = [%s]\n", gzerr, errmsg);
fflush(stderr); fflush(stderr);
} }
return (output); return (output);
@@ -1127,8 +1127,8 @@ int LoadSDF_GZ(char *name)
if (gzerr != Z_OK || pos == EOF) if (gzerr != Z_OK || pos == EOF)
return -errno; return -errno;
if (debug && errmsg != NULL) { if (debug && (errmsg != NULL) && (gzerr != Z_OK && gzerr != Z_STREAM_END)) {
fprintf(stderr, "LoadSDF_GZ: errmsg = [%s]\n", errmsg); fprintf(stderr, "LoadSDF_GZ: gzerr = %d, errmsg = [%s]\n", gzerr, errmsg);
fflush(stderr); fflush(stderr);
} }

2
src/main.cc
View File

@@ -1,4 +1,4 @@
double version = 3.20; double version = 3.21;
/****************************************************************************\ /****************************************************************************\
* Signal Server: Radio propagation simulator by Alex Farrant QCVS, 2E0TDW * * Signal Server: Radio propagation simulator by Alex Farrant QCVS, 2E0TDW *
****************************************************************************** ******************************************************************************