editorconfig - fix editor config warnings

Author: Pavel Siska

.github/workflows/check.yml

@@ -24,4 +24,4 @@ jobs:
     - name: Check out repository code
       uses: actions/checkout@v4
     - name: Check editorconfig
-      run: ec --exclude .git
+      run: ec --exclude .git --exclude tests/functional/inputs

CMakeLists.txt

@@ -24,7 +24,7 @@ option(ENABLE_RPMBUILD              "Enable build of RPM package"
 option(ENABLE_TESTS                 "Build tests (make test)"                                 OFF)
 
 if(ENABLE_MILISECONDS_TIMESTAMP)
-    add_compile_definitions(IPXP_TS_MSEC)
+	add_compile_definitions(IPXP_TS_MSEC)
 endif()
 
 if(ENABLE_NEMEA)
@@ -57,12 +57,12 @@ add_subdirectory(pkg)
 add_subdirectory(init)
 
 if (ENABLE_TESTS)
-    if (NOT ENABLE_NEMEA OR NOT ENABLE_OUTPUT_UNIREC OR NOT ENABLE_INPUT_PCAP)
-        message(FATAL_ERROR
-            "ENABLE_TESTS requires ENABLE_NEMEA, "
-            "ENABLE_INPUT_PCAP and ENABLE_OUTPUT_UNIREC to be enabled."
-        )
-    endif()
+	if (NOT ENABLE_NEMEA OR NOT ENABLE_OUTPUT_UNIREC OR NOT ENABLE_INPUT_PCAP)
+		message(FATAL_ERROR
+			"ENABLE_TESTS requires ENABLE_NEMEA, "
+			"ENABLE_INPUT_PCAP and ENABLE_OUTPUT_UNIREC to be enabled."
+		)
+	endif()
 	enable_testing()
-    add_subdirectory(tests)
+	add_subdirectory(tests)
 endif()

README.md

@@ -71,7 +71,7 @@ Here are the examples of various plugins usage:
 `./ipfixprobe -i 'dpdk-ring;r=rx_ipfixprobe_0;e= --proc-type=secondary' -i 'dpdk-ring;r=rx_ipfixprobe_1' -i 'dpdk-ring;r=rx_ipfixprobe_2' -i 'dpdk-ring;r=rx_ipfixprobe_3' -o 'text'`
 ```
 
-## Build 
+## Build
 
 ### Requirements
 - libatomic
@@ -129,7 +129,7 @@ To install ipfixprobe with NEMEA dependency from binary RPM packages, it is poss
 
 ## Telemetry
 
-`ipfixprobe` exports statistics and other diagnostic information through a telemetry interface based on appFs library, which leverages the fuse3 library (filesystem in userspace) to allow telemetry data to be accessed and manipulated 
+`ipfixprobe` exports statistics and other diagnostic information through a telemetry interface based on appFs library, which leverages the fuse3 library (filesystem in userspace) to allow telemetry data to be accessed and manipulated
 through standard filesystem operations.
 
 ```
@@ -264,4 +264,3 @@ Turn off message buffering using `buffer=off` option and set `timeout=WAIT` on o
 ```
 ./ipfixprobe -i 'pcap;file=traffic.pcap' -o 'unirec;i=u:out:timeout=WAIT:buffer=off'
 ```
-

cmake/dependencies.cmake

@@ -10,7 +10,7 @@ find_package(OpenSSL REQUIRED)
 if (ENABLE_INPUT_PCAP)
 	pkg_check_modules(PCAP REQUIRED libpcap)
 endif()
-	
+
 if (ENABLE_INPUT_DPDK)
 	pkg_check_modules(DPDK REQUIRED libdpdk)
 endif()

cmake/modules/FindAtomic.cmake

@@ -6,24 +6,24 @@
 #
 
 find_library(ATOMIC_LIBRARY
-  NAMES atomic libatomic.so.1 
-  HINTS ${ATOMIC_ROOT}
-     ${CMAKE_INSTALL_LIBDIR})
+	NAMES atomic libatomic.so.1
+	HINTS ${ATOMIC_ROOT}
+		 ${CMAKE_INSTALL_LIBDIR})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args (Atomic
-  REQUIRED_VARS ATOMIC_LIBRARY
+	REQUIRED_VARS ATOMIC_LIBRARY
 )
 
 if (ATOMIC_FOUND AND NOT TARGET atomic::atomic)
-  add_library(atomic::atomic STATIC IMPORTED)
-  set_target_properties(atomic::atomic PROPERTIES
-    IMPORTED_LOCATION "${ATOMIC_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${ATOMIC_INCLUDE_DIR}")
-  target_compile_definitions(atomic::atomic INTERFACE UNWIND_FOUND)
+	add_library(atomic::atomic STATIC IMPORTED)
+	set_target_properties(atomic::atomic PROPERTIES
+		IMPORTED_LOCATION "${ATOMIC_LIBRARY}"
+		INTERFACE_INCLUDE_DIRECTORIES "${ATOMIC_INCLUDE_DIR}")
+	target_compile_definitions(atomic::atomic INTERFACE UNWIND_FOUND)
 else()
-  message(CRITICAL "Notice: atomic not found")
-  add_library(atomic::atomic INTERFACE IMPORTED)
+	message(CRITICAL "Notice: atomic not found")
+	add_library(atomic::atomic INTERFACE IMPORTED)
 endif()
 
 unset(ATOMIC_LIBRARY)

cmake/modules/FindLZ4.cmake

@@ -11,10 +11,10 @@ Use this module by invoking find_package with the form::
 
 .. code-block:: cmake
 
-  find_package(LZ4
-    [version]              # Minimum version e.g. 1.8.0
-    [REQUIRED]             # Fail with error if LZ4 is not found
-  )
+	find_package(LZ4
+		[version]              # Minimum version e.g. 1.8.0
+		[REQUIRED]             # Fail with error if LZ4 is not found
+	)
 
 Imported targets
 ^^^^^^^^^^^^^^^^
@@ -23,26 +23,26 @@ This module defines the following :prop_tgt:`IMPORTED` targets:
 
 .. variable:: lz4::lz4
 
-  Imported target for using the LZ4 library, if found.
+	Imported target for using the LZ4 library, if found.
 
 Result variables
 ^^^^^^^^^^^^^^^^
 
 .. variable:: LZ4_FOUND
 
-  Set to true if LZ4 library found, otherwise false or undefined.
+	Set to true if LZ4 library found, otherwise false or undefined.
 
 .. variable:: LZ4_INCLUDE_DIRS
 
-  Paths to include directories listed in one variable for use by LZ4 client.
+	Paths to include directories listed in one variable for use by LZ4 client.
 
 .. variable:: LZ4_LIBRARIES
 
-  Paths to libraries to linked against to use LZ4.
+	Paths to libraries to linked against to use LZ4.
 
 .. variable:: LZ4_VERSION
 
-  The version string of LZ4 found.
+	The version string of LZ4 found.
 
 Cache variables
 ^^^^^^^^^^^^^^^
@@ -52,11 +52,11 @@ reads hints about search locations from the following variables::
 
 .. variable:: LZ4_INCLUDE_DIR
 
-  Path to LZ4 include directory with ``lz4.h`` header.
+	Path to LZ4 include directory with ``lz4.h`` header.
 
 .. variable:: LZ4_LIBRARY
 
-  Path to LZ4 library to be linked.
+	Path to LZ4 library to be linked.
 
 NOTE: The variables above should not usually be used in CMakeLists.txt files!
 
@@ -65,35 +65,35 @@ NOTE: The variables above should not usually be used in CMakeLists.txt files!
 ### Find library ##############################################################
 
 if(NOT LZ4_LIBRARY)
-  find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
-  find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
+	find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
+	find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
 
-  include(SelectLibraryConfigurations)
-  select_library_configurations(LZ4)
+	include(SelectLibraryConfigurations)
+	select_library_configurations(LZ4)
 else()
-  file(TO_CMAKE_PATH "${LZ4_LIBRARY}" LZ4_LIBRARY)
+	file(TO_CMAKE_PATH "${LZ4_LIBRARY}" LZ4_LIBRARY)
 endif()
 
 ### Find include directory ####################################################
 find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
 
 if(LZ4_INCLUDE_DIR AND EXISTS "${LZ4_INCLUDE_DIR}/lz4.h")
-    file(STRINGS "${LZ4_INCLUDE_DIR}/lz4.h" _lz4_h_contents
-      REGEX "#define LZ4_VERSION_[A-Z]+[ ]+[0-9]+")
-    string(REGEX REPLACE "#define LZ4_VERSION_MAJOR[ ]+([0-9]+).+" "\\1"
-      LZ4_VERSION_MAJOR "${_lz4_h_contents}")
-    string(REGEX REPLACE ".+#define LZ4_VERSION_MINOR[ ]+([0-9]+).+" "\\1"
-      LZ4_VERSION_MINOR "${_lz4_h_contents}")
-    string(REGEX REPLACE ".+#define LZ4_VERSION_RELEASE[ ]+([0-9]+).*" "\\1"
-      LZ4_VERSION_RELEASE "${_lz4_h_contents}")
-    set(LZ4_VERSION "${LZ4_VERSION_MAJOR}.${LZ4_VERSION_MINOR}.${LZ4_VERSION_RELEASE}")
-    unset(_lz4_h_contents)
+		file(STRINGS "${LZ4_INCLUDE_DIR}/lz4.h" _lz4_h_contents
+			REGEX "#define LZ4_VERSION_[A-Z]+[ ]+[0-9]+")
+		string(REGEX REPLACE "#define LZ4_VERSION_MAJOR[ ]+([0-9]+).+" "\\1"
+			LZ4_VERSION_MAJOR "${_lz4_h_contents}")
+		string(REGEX REPLACE ".+#define LZ4_VERSION_MINOR[ ]+([0-9]+).+" "\\1"
+			LZ4_VERSION_MINOR "${_lz4_h_contents}")
+		string(REGEX REPLACE ".+#define LZ4_VERSION_RELEASE[ ]+([0-9]+).*" "\\1"
+			LZ4_VERSION_RELEASE "${_lz4_h_contents}")
+		set(LZ4_VERSION "${LZ4_VERSION_MAJOR}.${LZ4_VERSION_MINOR}.${LZ4_VERSION_RELEASE}")
+		unset(_lz4_h_contents)
 endif()
 
 ### Set result variables ######################################################
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZ4 DEFAULT_MSG
-    LZ4_LIBRARY LZ4_INCLUDE_DIR LZ4_VERSION)
+		LZ4_LIBRARY LZ4_INCLUDE_DIR LZ4_VERSION)
 
 mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY)
 
@@ -102,29 +102,29 @@ set(LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR})
 
 ### Import targets ############################################################
 if(LZ4_FOUND)
-  if(NOT TARGET lz4::lz4)
-    add_library(lz4::lz4 UNKNOWN IMPORTED)
-    set_target_properties(lz4::lz4 PROPERTIES
-      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-      INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}")
-
-    if(LZ4_LIBRARY_RELEASE)
-      set_property(TARGET lz4::lz4 APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS RELEASE)
-      set_target_properties(lz4::lz4 PROPERTIES
-        IMPORTED_LOCATION_RELEASE "${LZ4_LIBRARY_RELEASE}")
-      endif()
-
-    if(LZ4_LIBRARY_DEBUG)
-      set_property(TARGET lz4::lz4 APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS DEBUG)
-      set_target_properties(lz4::lz4 PROPERTIES
-        IMPORTED_LOCATION_DEBUG "${LZ4_LIBRARY_DEBUG}")
-    endif()
-
-    if(NOT LZ4_LIBRARY_RELEASE AND NOT LZ4_LIBRARY_DEBUG)
-      set_property(TARGET lz4::lz4 APPEND PROPERTY
-        IMPORTED_LOCATION "${LZ4_LIBRARY}")
-    endif()
-  endif()
+	if(NOT TARGET lz4::lz4)
+		add_library(lz4::lz4 UNKNOWN IMPORTED)
+		set_target_properties(lz4::lz4 PROPERTIES
+			IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+			INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}")
+
+		if(LZ4_LIBRARY_RELEASE)
+			set_property(TARGET lz4::lz4 APPEND PROPERTY
+				IMPORTED_CONFIGURATIONS RELEASE)
+			set_target_properties(lz4::lz4 PROPERTIES
+				IMPORTED_LOCATION_RELEASE "${LZ4_LIBRARY_RELEASE}")
+			endif()
+
+		if(LZ4_LIBRARY_DEBUG)
+			set_property(TARGET lz4::lz4 APPEND PROPERTY
+				IMPORTED_CONFIGURATIONS DEBUG)
+			set_target_properties(lz4::lz4 PROPERTIES
+				IMPORTED_LOCATION_DEBUG "${LZ4_LIBRARY_DEBUG}")
+		endif()
+
+		if(NOT LZ4_LIBRARY_RELEASE AND NOT LZ4_LIBRARY_DEBUG)
+			set_property(TARGET lz4::lz4 APPEND PROPERTY
+				IMPORTED_LOCATION "${LZ4_LIBRARY}")
+		endif()
+	endif()
 endif()

cmake/modules/FindNUMA.cmake

@@ -17,12 +17,12 @@ find_path(NUMA_INCLUDE_DIR numa.h)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
-  NUMA
-  REQUIRED_VARS NUMA_INCLUDE_DIR NUMA_LIBRARY
-  FAIL_MESSAGE "NUMA not found! Try to install numactl-devel package.")
+	NUMA
+	REQUIRED_VARS NUMA_INCLUDE_DIR NUMA_LIBRARY
+	FAIL_MESSAGE "NUMA not found! Try to install numactl-devel package.")
 
 if(NUMA_FOUND AND NOT TARGET numa::numa)
-  add_library(numa::numa INTERFACE IMPORTED)
-  set_property(TARGET numa::numa PROPERTY INTERFACE_LINK_LIBRARIES "${NUMA_LIBRARY}")
-  set_property(TARGET numa::numa PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${NUMA_INCLUDE_DIR}")
+	add_library(numa::numa INTERFACE IMPORTED)
+	set_property(TARGET numa::numa PROPERTY INTERFACE_LINK_LIBRARIES "${NUMA_LIBRARY}")
+	set_property(TARGET numa::numa PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${NUMA_INCLUDE_DIR}")
 endif()

cmake/modules/FindUnwind.cmake

@@ -2,23 +2,23 @@
 # Once done this will define
 #
 #  UNWIND_FOUND - system has libunwind
-#  unwind::unwind - cmake target 
+#  unwind::unwind - cmake target
 
 find_package(PkgConfig QUIET)
 if (PKG_CONFIG_FOUND)
 	pkg_check_modules(PC_UNWIND QUIET libunwind)
 endif()
 
-find_path (UNWIND_INCLUDE_DIR 
-  NAMES unwind.h libunwind.h
-  HINTS ${UNWIND_ROOT} ${PC_UNWIND_INCLUDEDIR} ${PC_UNWIND_INCLUDE_DIRS}
-  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}
+find_path (UNWIND_INCLUDE_DIR
+	NAMES unwind.h libunwind.h
+	HINTS ${UNWIND_ROOT} ${PC_UNWIND_INCLUDEDIR} ${PC_UNWIND_INCLUDE_DIRS}
+	PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}
 )
 
-find_library (UNWIND_LIBRARY 
-  NAMES unwind
-  HINTS ${UNWIND_ROOT} ${PC_UNWIND_LIBDIR} ${PC_UNWIND_LIBRARY_DIRS}
-  PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}  
+find_library (UNWIND_LIBRARY
+	NAMES unwind
+	HINTS ${UNWIND_ROOT} ${PC_UNWIND_LIBDIR} ${PC_UNWIND_LIBRARY_DIRS}
+	PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR}
 )
 
 mark_as_advanced (UNWIND_INCLUDE_DIR UNWIND_LIBRARY)
@@ -27,18 +27,18 @@ include (FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set Unwind_FOUND to TRUE
 # if all listed variables are TRUE
 find_package_handle_standard_args (Unwind
-  REQUIRED_VARS UNWIND_INCLUDE_DIR UNWIND_LIBRARY
+	REQUIRED_VARS UNWIND_INCLUDE_DIR UNWIND_LIBRARY
 )
 
 if (UNWIND_FOUND AND NOT TARGET unwind::unwind)
-  add_library(unwind::unwind STATIC IMPORTED)
-  set_target_properties(unwind::unwind PROPERTIES
-    IMPORTED_LOCATION "${UNWIND_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${UNWIND_INCLUDE_DIR}")
-  target_compile_definitions(unwind::unwind INTERFACE UNWIND_FOUND)
+	add_library(unwind::unwind STATIC IMPORTED)
+	set_target_properties(unwind::unwind PROPERTIES
+		IMPORTED_LOCATION "${UNWIND_LIBRARY}"
+		INTERFACE_INCLUDE_DIRECTORIES "${UNWIND_INCLUDE_DIR}")
+	target_compile_definitions(unwind::unwind INTERFACE UNWIND_FOUND)
 else()
-  message(WARNING "Notice: UNWIND not found, no unwind support")
-  add_library(unwind::unwind INTERFACE IMPORTED)
+	message(WARNING "Notice: UNWIND not found, no unwind support")
+	add_library(unwind::unwind INTERFACE IMPORTED)
 endif()
 
 unset(UNWIND_INCLUDE_DIR)

include/ipfixprobe/inputPlugin.hpp

@@ -117,4 +117,4 @@ class IPXP_API PluginFactory;
  */
 using InputPluginFactory = PluginFactory<InputPlugin, const std::string&>;
 
-} // namespace ipxp
+} // namespace ipxp

include/ipfixprobe/pluginFactory/pluginFactory.hpp

@@ -167,4 +167,4 @@ class PluginFactory {
 	std::map<PluginManifest, Generators, PluginManifestComparator> m_registeredPlugins;
 };
 
-} // namespace ipxp
+} // namespace ipxp