Browse Source

libmseed: silence compiler warnings

- includes a fix for blockette 395, where byte swapping of timestamp seems to
  have been broken (Calibration Abort Blockette, end of calibration time)
conda
Sebastian Heimann 4 months ago
parent
commit
ee10924079
  1. 14
      libmseed-2.19.6-fix-blkt-395-bswap.patch
  2. 11
      libmseed-2.19.6-selection-fallthru.patch
  3. 2
      prerequisites/prerequisites.bat
  4. 2
      prerequisites/prerequisites.sh

14
libmseed-2.19.6-fix-blkt-395-bswap.patch

@ -0,0 +1,14 @@
diff -ruN libmseed/parseutils.c libmseed_mod/parseutils.c
--- libmseed/parseutils.c 2019-06-19 10:59:29.000000000 +0200
+++ libmseed_mod/parseutils.c 2022-03-15 09:08:10.735934106 +0100
@@ -943,8 +943,9 @@
{
struct blkt_395_s *blkt_395 = (struct blkt_395_s *)(record + blkt_offset + 4);
- if (swapflag)
+ if (swapflag) {
MS_SWAPBTIME (&blkt_395->time);
+ }
if (details >= 1)
{

11
libmseed-2.19.6-selection-fallthru.patch

@ -0,0 +1,11 @@
diff -ruN libmseed/selection.c libmseed_mod/selection.c
--- libmseed/selection.c 2019-06-19 10:59:29.000000000 +0200
+++ libmseed_mod/selection.c 2022-03-15 08:54:29.178367090 +0100
@@ -703,6 +703,7 @@
case '\\':
if (*pattern)
c = *pattern++;
+ /* FALLTHRU */
default:
if (c != *string)
return GLOBMATCH_FALSE;

2
prerequisites/prerequisites.bat

@ -4,6 +4,8 @@
IF NOT EXIST "libmseed" (
tar -xzf libmseed-2.19.6.tar.gz --exclude=doc --exclude=test --exclude=example
patch -s -p0 < libmseed-2.19.6-speedread.patch
patch -s -p0 < libmseed-2.19.6-selection-fallthru.patch
patch -s -p0 < libmseed-2.19.6-fix-blkt-395-bswap.patch
) ELSE (
ECHO libmseed found
)

2
prerequisites/prerequisites.sh

@ -6,6 +6,8 @@ if [ ! -d libmseed ]; then
rm -rf libmseed
tar -xzf libmseed-2.19.6.tar.gz --exclude=doc --exclude=test --exclude=example
patch -s -p0 < libmseed-2.19.6-speedread.patch
patch -s -p0 < libmseed-2.19.6-selection-fallthru.patch
patch -s -p0 < libmseed-2.19.6-fix-blkt-395-bswap.patch
fi
if [ ! -d evalresp-3.3.0/lib ]; then

Loading…
Cancel
Save