Merge branch 'next' of github.com:gnss-sdr/gnss-sdr into pps_lime

.clang-tidy

@@ -23,6 +23,7 @@ Checks: '-*,
         bugprone-move-forwarding-reference,
         bugprone-multiple-statement-macro,
         bugprone-parent-virtual-call,
+        bugprone-redundant-branch-condition,
         bugprone-reserved-identifier,
         bugprone-sizeof-container,
         bugprone-sizeof-expression,
@@ -70,6 +71,7 @@ Checks: '-*,
         misc-misplaced-const,
         misc-new-delete-overloads,
         misc-non-copyable-objects,
+        misc-redundant-expression,
         misc-static-assert,
         misc-throw-by-value-catch-by-reference,
         misc-uniqueptr-reset-release,
@@ -356,7 +358,7 @@ std::vector::at;
   - key:             google-runtime-int.TypeSuffix
     value:           _t
   - key:             bugprone-reserved-identifier.AllowedIdentifiers
-    value:           ''
+    value:           '_pb;_pbi'
   - key:             modernize-use-emplace.IgnoreImplicitConstructors
     value:           'false'
   - key:             modernize-use-equals-delete.IgnoreMacros

CMakeLists.txt

@@ -339,12 +339,12 @@ set(GNSSSDR_ARMADILLO_LOCAL_VERSION "12.2.x")
 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
 set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.23")
-set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.2")
+set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.4")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.13")
 set(GNSSSDR_GTEST_LOCAL_VERSION "1.13.0")
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
 set(GNSSSDR_GNSSTK_LOCAL_VERSION "14.0.0")
-set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.7.1")
+set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.8.0")
 set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7")
 
 # Downgrade versions if requirements are not met

cmake/Modules/BuildProtobuf.cmake

@@ -9,13 +9,11 @@
 # abseil-cpp >= 20230117 libraries (see https://github.com/abseil/abseil-cpp)
 # already installed. Zlib is used if found.
 #
-# Note: requires the patch command if using GCC >= 13 or Clang >= 16
-#
 # Creates protobuf::libprotobuf and protobuf::protoc imported targets.
 
 
 if(NOT GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION)
-    set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.2")
+    set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.4")
 endif()
 
 if(NOT GNSSSDR_BINARY_DIR)
@@ -57,25 +55,6 @@ list(APPEND UTF8_LIBRARIES
     ${GNSSSDR_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}utf8_range${CMAKE_STATIC_LIBRARY_SUFFIX}
 )
 
-# Fix for GCC 13 and Clang 16
-if(((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "13")) OR
-  ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "16")))
-    find_program(Patch_EXECUTABLE NAME patch PATHS ENV PATH)
-    if(NOT Patch_EXECUTABLE)
-        message(FATAL_ERROR "The patch command is not found. It is required to build Protocol Buffers. Please check your OS documentation and install the patch command.")
-    endif()
-    set(PROTOBUF_PATCH_COMMAND
-        cd ${GNSSSDR_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/src/google/protobuf/ &&
-        ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/src/google/protobuf/port.h < ${GNSSSDR_SOURCE_DIR}/src/tests/data/protobuf22.patch
-    )
-    # Patch only once
-    if(EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/src/google/protobuf/port.h)
-        set(PROTOBUF_PATCH_COMMAND "")
-    endif()
-else()
-    set(PROTOBUF_PATCH_COMMAND "")
-endif()
-
 ExternalProject_Add(protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}
     PREFIX ${GNSSSDR_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}
     GIT_REPOSITORY https://github.com/protocolbuffers/protobuf

src/algorithms/libs/rtklib/rtklib_rtkcmn.cc

@@ -229,7 +229,7 @@ void fatalerr(const char *format, ...)
     char msg[1024];
     va_list ap;
     va_start(ap, format);
-    vsprintf(msg, format, ap);
+    vsnprintf(msg, sizeof(msg), format, ap);
     va_end(ap);
     fprintf(stderr, "%s", msg);
     exit(-9);
@@ -4084,7 +4084,7 @@ void trace(int level, const char *format, ...)
     va_list ap;
     char buffer[256];
     va_start(ap, format);
-    vsprintf(buffer, format, ap);
+    vsnprintf(buffer, sizeof(buffer), format, ap);
     va_end(ap);
     std::string str(buffer);
     VLOG(level) << "RTKLIB TRACE[" << level << "]:" << str;

src/algorithms/libs/rtklib/rtklib_rtkpos.cc

@@ -504,7 +504,7 @@ void errmsg(rtk_t *rtk, const char *format, ...)
     time2str(rtk->sol.time, tstr, 2);
     n = std::snprintf(buff, sizeof(buff), "%s: ", tstr + 11);
     va_start(ap, format);
-    n += vsprintf(buff + n, format, ap);
+    n += vsnprintf(buff + n, sizeof(buff) - n, format, ap);
     va_end(ap);
     n = n < MAXERRMSG - rtk->neb ? n : MAXERRMSG - rtk->neb;
     memcpy(rtk->errbuf + rtk->neb, buff, n);

src/tests/data/protobuf22.patch

@@ -1,12 +0,0 @@
-SPDX-License-Identifier: GPL-3.0-or-later
-SPDX-FileCopyrightText: 2023 Carles Fernandez-Prades <carles.fernandez@cttc.es>
---- port.h	2023-03-31 11:40:38.000000000 +0100
-+++ port.h	2023-03-31 11:56:49.000000000 +0100
-@@ -38,6 +38,7 @@
- 
- #include <cassert>
- #include <cstddef>
-+#include <cstdint>
- #include <new>
- #include <string>
- #include <type_traits>