Skip to content

Commit c507977

Browse files
egecetinegecetin
authored
Fix pre-commit configuration for gersemi (seladb#1670)
* fix pre-commit configuration * pre-commit fixes * improve exclude more * apply fixes
1 parent 8e82194 commit c507977

File tree

38 files changed

+384
-533
lines changed

38 files changed

+384
-533
lines changed

‎.pre-commit-config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exclude: '.*\.(pcap|pcapng|dat|txt)'
1+
exclude: '.*\.(pcap|pcapng|dat)|(PacketExamples|PcapExamples|expected_output|pcap_examples).*\.txt'
22
fail_fast: false
33
repos:
44
- repo: local
@@ -41,6 +41,7 @@ repos:
4141
rev: 0.17.1
4242
hooks:
4343
- id: gersemi
44+
args: ["-c"]
4445
- repo: https://github.com/codespell-project/codespell
4546
rev: v2.3.0
4647
hooks:

‎3rdParty/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ if(PCAPPP_INSTALL)
1111
EXPORT PcapPlusPlusTargets
1212
ARCHIVE DESTINATION ${PCAPPP_INSTALL_LIBDIR}
1313
LIBRARY DESTINATION ${PCAPPP_INSTALL_LIBDIR}
14-
PUBLIC_HEADER DESTINATION ${PCAPPP_INSTALL_INCLUDEDIR})
14+
PUBLIC_HEADER DESTINATION ${PCAPPP_INSTALL_INCLUDEDIR}
15+
)
1516
endif()

‎3rdParty/EndianPortable/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
add_library(EndianPortable INTERFACE)
22

3-
target_include_directories(EndianPortable
4-
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
3+
target_include_directories(EndianPortable INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
54

6-
target_sources(EndianPortable
7-
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include/EndianPortable.h)
5+
target_sources(EndianPortable INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include/EndianPortable.h)

‎3rdParty/Getopt-for-Visual-Studio/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
add_library(Getopt-for-Visual-Studio INTERFACE)
22

3-
target_include_directories(Getopt-for-Visual-Studio
4-
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/)
3+
target_include_directories(Getopt-for-Visual-Studio INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/)
54

6-
target_sources(Getopt-for-Visual-Studio
7-
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/getopt.h)
5+
target_sources(Getopt-for-Visual-Studio INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/getopt.h)

‎3rdParty/LightPcapNg/CMakeLists.txt

+8-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/LightPcapNg/cmake/")
77
option(LIGHT_PCAPNG_ZSTD "Build with ZSTD compression support" OFF)
88

99
add_library(
10-
light_pcapng OBJECT
10+
light_pcapng
11+
OBJECT
1112
LightPcapNg/src/light_advanced.c
1213
LightPcapNg/src/light_alloc.c
1314
LightPcapNg/src/light_compression.c
@@ -20,16 +21,19 @@ add_library(
2021
LightPcapNg/src/light_pcapng_ext.c
2122
LightPcapNg/src/light_pcapng.c
2223
LightPcapNg/src/light_platform.c
23-
LightPcapNg/src/light_zstd_compression.c)
24+
LightPcapNg/src/light_zstd_compression.c
25+
)
2426

2527
target_compile_definitions(light_pcapng PUBLIC -DUNIVERSAL)
2628

2729
if(BUILD_SHARED_LIBS)
2830
set_property(TARGET light_pcapng PROPERTY POSITION_INDEPENDENT_CODE ON)
2931
endif()
3032

31-
target_include_directories(light_pcapng PUBLIC $<INSTALL_INTERFACE:include>
32-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/LightPcapNg/include>)
33+
target_include_directories(
34+
light_pcapng
35+
PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/LightPcapNg/include>
36+
)
3337

3438
if(LIGHT_PCAPNG_ZSTD)
3539
find_package(ZSTD)

‎3rdParty/LightPcapNg/LightPcapNg/CMakeLists.txt

+66-84
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,66 @@
1-
cmake_minimum_required (VERSION 2.6)
2-
project (light_pcapng C)
3-
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/include/ -Wall -O2 -fPIC -DUNIVERSAL -g")
4-
5-
add_library (light_pcapng SHARED
6-
src/light_io.c
7-
src/light_pcapng.c
8-
src/light_pcapng_cont.c
9-
src/light_platform.c
10-
src/light_manipulate.c
11-
src/light_internal.c
12-
src/light_alloc.c
13-
src/light_advanced.c
14-
src/light_option.c
15-
src/light_pcapng_ext.c
16-
)
17-
18-
add_library (light_pcapng_static STATIC
19-
src/light_io.c
20-
src/light_pcapng.c
21-
src/light_pcapng_cont.c
22-
src/light_platform.c
23-
src/light_manipulate.c
24-
src/light_internal.c
25-
src/light_alloc.c
26-
src/light_advanced.c
27-
src/light_option.c
28-
src/light_pcapng_ext.c
29-
)
30-
31-
add_executable (test_read.test
32-
src/tests/test_read.c
33-
)
34-
target_link_libraries(test_read.test light_pcapng_static)
35-
36-
add_executable (test_read_write.test
37-
src/tests/test_read_write.c
38-
)
39-
target_link_libraries(test_read_write.test light_pcapng_static)
40-
41-
add_executable (test_mem.test
42-
src/tests/test_mem.c
43-
)
44-
target_link_libraries(test_mem.test light_pcapng_static)
45-
46-
add_executable (test_histogram.test
47-
src/tests/test_histogram.c
48-
)
49-
target_link_libraries(test_histogram.test light_pcapng_static)
50-
51-
add_executable (test_subcapture.test
52-
src/tests/test_subcapture.c
53-
)
54-
target_link_libraries(test_subcapture.test light_pcapng_static)
55-
56-
add_executable (test_feature.test
57-
src/tests/test_feature.c
58-
)
59-
target_link_libraries(test_feature.test light_pcapng_static)
60-
61-
add_executable (test_flow.test
62-
src/tests/test_flow.c
63-
)
64-
target_link_libraries(test_flow.test light_pcapng_static)
65-
66-
add_executable (test_feature_advanced.test
67-
src/tests/test_feature_advanced.c
68-
)
69-
target_link_libraries(test_feature_advanced.test light_pcapng_static dl)
70-
71-
add_executable (test_read_packets.test
72-
src/tests/test_read_packets.c
73-
)
74-
target_link_libraries(test_read_packets.test light_pcapng_static)
75-
76-
add_executable (test_read_write_packets.test
77-
src/tests/test_read_write_packets.c
78-
)
79-
target_link_libraries(test_read_write_packets.test light_pcapng_static)
80-
81-
add_executable (test_split.test
82-
src/tests/test_split.c
83-
)
84-
target_link_libraries(test_split.test light_pcapng_static)
1+
cmake_minimum_required(VERSION 2.6)
2+
project(light_pcapng C)
3+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/include/ -Wall -O2 -fPIC -DUNIVERSAL -g")
4+
5+
add_library(
6+
light_pcapng
7+
SHARED
8+
src/light_io.c
9+
src/light_pcapng.c
10+
src/light_pcapng_cont.c
11+
src/light_platform.c
12+
src/light_manipulate.c
13+
src/light_internal.c
14+
src/light_alloc.c
15+
src/light_advanced.c
16+
src/light_option.c
17+
src/light_pcapng_ext.c
18+
)
19+
20+
add_library(
21+
light_pcapng_static
22+
STATIC
23+
src/light_io.c
24+
src/light_pcapng.c
25+
src/light_pcapng_cont.c
26+
src/light_platform.c
27+
src/light_manipulate.c
28+
src/light_internal.c
29+
src/light_alloc.c
30+
src/light_advanced.c
31+
src/light_option.c
32+
src/light_pcapng_ext.c
33+
)
34+
35+
add_executable(test_read.test src/tests/test_read.c)
36+
target_link_libraries(test_read.test light_pcapng_static)
37+
38+
add_executable(test_read_write.test src/tests/test_read_write.c)
39+
target_link_libraries(test_read_write.test light_pcapng_static)
40+
41+
add_executable(test_mem.test src/tests/test_mem.c)
42+
target_link_libraries(test_mem.test light_pcapng_static)
43+
44+
add_executable(test_histogram.test src/tests/test_histogram.c)
45+
target_link_libraries(test_histogram.test light_pcapng_static)
46+
47+
add_executable(test_subcapture.test src/tests/test_subcapture.c)
48+
target_link_libraries(test_subcapture.test light_pcapng_static)
49+
50+
add_executable(test_feature.test src/tests/test_feature.c)
51+
target_link_libraries(test_feature.test light_pcapng_static)
52+
53+
add_executable(test_flow.test src/tests/test_flow.c)
54+
target_link_libraries(test_flow.test light_pcapng_static)
55+
56+
add_executable(test_feature_advanced.test src/tests/test_feature_advanced.c)
57+
target_link_libraries(test_feature_advanced.test light_pcapng_static dl)
58+
59+
add_executable(test_read_packets.test src/tests/test_read_packets.c)
60+
target_link_libraries(test_read_packets.test light_pcapng_static)
61+
62+
add_executable(test_read_write_packets.test src/tests/test_read_write_packets.c)
63+
target_link_libraries(test_read_write_packets.test light_pcapng_static)
64+
65+
add_executable(test_split.test src/tests/test_split.c)
66+
target_link_libraries(test_split.test light_pcapng_static)

‎3rdParty/LightPcapNg/LightPcapNg/LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

‎3rdParty/MemPlumber/MemPlumber/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
1010
endif()
1111

1212
# Build options
13-
option(MEMPLUMBER_COLLECT_STATIC_VAR_DATA
14-
"Collect data also on static variable memory allocation" OFF)
13+
option(MEMPLUMBER_COLLECT_STATIC_VAR_DATA "Collect data also on static variable memory allocation" OFF)
1514
option(MEMPLUMBER_DISABLE_BACKTRACE "Disable backtrace" OFF)
1615
option(MEMPLUMBER_BUILD_TESTS "Build Tests" ${MEMPLUMBER_MAIN_PROJECT})
1716
option(MEMPLUMBER_BUILD_EXAMPLES "Build Examples" ${MEMPLUMBER_MAIN_PROJECT})
@@ -37,11 +36,11 @@ if(MEMPLUMBER_DISABLE_BACKTRACE)
3736
add_definitions(-DDISABLE_BACKTRACE)
3837
endif()
3938

40-
if (MEMPLUMBER_BUILD_TESTS)
39+
if(MEMPLUMBER_BUILD_TESTS)
4140
enable_testing()
4241
add_subdirectory(Tests)
4342
endif()
4443

45-
if (MEMPLUMBER_BUILD_EXAMPLES)
44+
if(MEMPLUMBER_BUILD_EXAMPLES)
4645
add_subdirectory(Examples)
4746
endif()

‎3rdParty/MemPlumber/MemPlumber/Examples/CMakeLists.txt

+13-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
1-
cmake_minimum_required (VERSION 3.0)
2-
3-
add_executable(basic-example
4-
basic-example.cpp
5-
)
6-
7-
target_link_libraries(basic-example PUBLIC
8-
memplumber
9-
)
10-
11-
add_executable(static-example
12-
static-example.cpp
13-
)
14-
15-
target_link_libraries(static-example PUBLIC
16-
memplumber
17-
)
18-
19-
add_executable(dump-to-file-example
20-
dump-to-file-example.cpp
21-
)
22-
23-
target_link_libraries(dump-to-file-example PUBLIC
24-
memplumber
25-
)
1+
cmake_minimum_required(VERSION 3.0)
2+
3+
add_executable(basic-example basic-example.cpp)
4+
5+
target_link_libraries(basic-example PUBLIC memplumber)
6+
7+
add_executable(static-example static-example.cpp)
8+
9+
target_link_libraries(static-example PUBLIC memplumber)
10+
11+
add_executable(dump-to-file-example dump-to-file-example.cpp)
12+
13+
target_link_libraries(dump-to-file-example PUBLIC memplumber)

0 commit comments

Comments
 (0)