From 31c4e12ac9f2f4eadfb6f034845e51bff7faf223 Mon Sep 17 00:00:00 2001
From: Tom M <tom.mbrt@googlemail.com>
Date: Tue, 28 Jul 2020 21:05:01 +0200
Subject: [PATCH] Update Travis CI (#658)

* update to Ubuntu Focal
* use clang10
* avoid unintentional fallbacks to  default `/usr/bin/c++` compiler
* fix related compiler warnings
---
 .travis.yml                 | 37 +++++++++++++++++++++++++++----------
 src/utils/fluid_sys.h       |  8 ++++----
 src/utils/fluidsynth_priv.h |  2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b5de751..27ba835e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,16 @@
 language: c
 sudo: false
 os: linux
-dist: bionic
+dist: focal
 addons:
   apt:
     update: true
     sources:
     - ubuntu-toolchain-r-test
-    - llvm-toolchain-bionic-7
-    - llvm-toolchain-bionic-8
-    - llvm-toolchain-bionic-9
+    - llvm-toolchain-focal-7
+    - llvm-toolchain-focal-8
+    - llvm-toolchain-focal-9
+    - llvm-toolchain-focal-10
     packages:
     - cmake-data
     - cmake
@@ -38,31 +39,47 @@ matrix:
   include:
     - arch: arm64
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && sudo apt-get install gcc-7"
+        - CC="gcc-7"
+        - CXX="g++-7"
+        - MATRIX_EVAL="sudo apt-get install gcc-7 g++-7"
 
     - env:
-        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8 && sudo apt-get install gcc-8"
+        - CC="gcc-8"
+        - CXX="g++-8"
+        - MATRIX_EVAL="sudo apt-get install gcc-8 g++-8"
         - CMAKE_FLAGS="-Denable-debug=1 -DCMAKE_C_FLAGS_DEBUG=-fuse-ld=gold"
 
     - env:
-        - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7 && sudo apt-get install clang-7"
+        - CC="clang-7"
+        - CXX="clang++-7"
+        - MATRIX_EVAL="sudo apt-get install clang-7"
 
     - env:
-        - MATRIX_EVAL="CC=clang-8 && CXX=clang++-8 && sudo rm -f /usr/local/clang-7.0.0/bin/clang-tidy && sudo ln -s /usr/bin/clang-tidy-8 /usr/bin/clang-tidy && sudo apt-get install clang-8 clang-tidy-8"
+        - CC="clang-8"
+        - CXX="clang++-8"
+        - MATRIX_EVAL="sudo rm -f /usr/local/clang-7.0.0/bin/clang-tidy && sudo ln -s /usr/bin/clang-tidy-8 /usr/bin/clang-tidy && sudo apt-get install clang-8 clang-tidy-8"
         - CMAKE_FLAGS="-Denable-profiling=1 -DCMAKE_C_FLAGS_DEBUG=-fuse-ld=gold"
 
     - env:
-        - MATRIX_EVAL="CC=clang-9 && CXX=clang++-9 && sudo apt-get install clang-9"
+        - CC="clang-9"
+        - CXX="clang++-9"
+        - MATRIX_EVAL="sudo apt-get install clang-9"
+
+    - env:
+        - CC="clang-10"
+        - CXX="clang++-10"
+        - MATRIX_EVAL="sudo apt-get install clang-10"
 
     - os: linux-ppc64le
       env:
         - CMAKE_FLAGS=""
 
 before_install:
-    - eval "${MATRIX_EVAL}"
     - which clang-tidy || true
     - ls -la `which clang-tidy` || true
     - echo $PATH
+    - echo $MATRIX_EVAL
+    - eval "${MATRIX_EVAL}"
 
 before_script:
     - mkdir $HOME/fluidsynth_install/
diff --git a/src/utils/fluid_sys.h b/src/utils/fluid_sys.h
index 86be0610..06916b22 100644
--- a/src/utils/fluid_sys.h
+++ b/src/utils/fluid_sys.h
@@ -404,19 +404,19 @@ typedef GStaticPrivate fluid_private_t;
   g_atomic_pointer_compare_and_exchange(_pp, _old, _new)
 
 static FLUID_INLINE void
-fluid_atomic_float_set(volatile float *fptr, float val)
+fluid_atomic_float_set(fluid_atomic_float_t *fptr, float val)
 {
     int32_t ival;
     memcpy(&ival, &val, 4);
-    fluid_atomic_int_set((volatile int *)fptr, ival);
+    fluid_atomic_int_set((fluid_atomic_int_t *)fptr, ival);
 }
 
 static FLUID_INLINE float
-fluid_atomic_float_get(volatile float *fptr)
+fluid_atomic_float_get(fluid_atomic_float_t *fptr)
 {
     int32_t ival;
     float fval;
-    ival = fluid_atomic_int_get((volatile int *)fptr);
+    ival = fluid_atomic_int_get((fluid_atomic_int_t *)fptr);
     memcpy(&fval, &ival, 4);
     return fval;
 }
diff --git a/src/utils/fluidsynth_priv.h b/src/utils/fluidsynth_priv.h
index 19f067c4..8d929c96 100644
--- a/src/utils/fluidsynth_priv.h
+++ b/src/utils/fluidsynth_priv.h
@@ -214,7 +214,7 @@ void* fluid_alloc(size_t len);
 #define FLUID_STRCPY(_dst,_src)      strcpy(_dst,_src)
 
 #define FLUID_STRNCPY(_dst,_src,_n) \
-do { strncpy(_dst,_src,_n); \
+do { strncpy(_dst,_src,_n-1); \
     (_dst)[(_n)-1]='\0'; \
 }while(0)