diff options
author | Marc <foxtrot@malloc.me> | 2021-12-07 18:41:53 +0000 |
---|---|---|
committer | Marc <foxtrot@malloc.me> | 2021-12-07 18:41:53 +0000 |
commit | d40ddfe15dacab59b2911b59adb0d087b94ccc03 (patch) | |
tree | 8e8fb6e73f0c416ef9e0c700ab7e64567037517c | |
parent | 996e85deb4aa68606a8c1ae90712008fe0f56a94 (diff) | |
download | libwifi-d40ddfe15dacab59b2911b59adb0d087b94ccc03.tar.gz libwifi-d40ddfe15dacab59b2911b59adb0d087b94ccc03.tar.bz2 libwifi-d40ddfe15dacab59b2911b59adb0d087b94ccc03.zip |
build: Unset hard dependency on clang in CMake
This commit also corrects a small warning for gcc.
-rw-r--r-- | CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/libwifi/core/frame/tag_iterator.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a94d82..cb0ee76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -5,7 +5,13 @@ project(wifi DESCRIPTION "802.11 Parsing / Generation library" VERSION 0.1) | |||
5 | execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITBRANCH) | 5 | execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITBRANCH) |
6 | execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH) | 6 | execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH) |
7 | execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME) | 7 | execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME) |
8 | set(LIBWIFI_VERSION "0.0.1") | 8 | set(LIBWIFI_VERSION "0.0.2") |
9 | |||
10 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") | ||
11 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") | ||
12 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wno-language-extension-token") | ||
13 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes -Wstrict-prototypes") | ||
14 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") | ||
9 | 15 | ||
10 | message(" ") | 16 | message(" ") |
11 | message(" _ _ _ _ __ _ ") | 17 | message(" _ _ _ _ __ _ ") |
@@ -17,6 +23,7 @@ message("|_||_||_.__/ \\_/\\_/ |_||_| |_| ") | |||
17 | message("-----------------------------------") | 23 | message("-----------------------------------") |
18 | message("802.11 Parsing / Generation Library") | 24 | message("802.11 Parsing / Generation Library") |
19 | message("Version: ${LIBWIFI_VERSION}, Git: ${GITBRANCH} (${GITHASH}), Time: ${BUILDTIME}") | 25 | message("Version: ${LIBWIFI_VERSION}, Git: ${GITBRANCH} (${GITHASH}), Time: ${BUILDTIME}") |
26 | message("Compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}") | ||
20 | message(" ") | 27 | message(" ") |
21 | 28 | ||
22 | file(GLOB_RECURSE libwifi_src | 29 | file(GLOB_RECURSE libwifi_src |
@@ -24,13 +31,6 @@ file(GLOB_RECURSE libwifi_src | |||
24 | "src/libwifi/*.c" | 31 | "src/libwifi/*.c" |
25 | ) | 32 | ) |
26 | 33 | ||
27 | set(CMAKE_C_COMPILER "/usr/bin/clang") | ||
28 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") | ||
29 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") | ||
30 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wno-language-extension-token") | ||
31 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes -Wstrict-prototypes") | ||
32 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") | ||
33 | |||
34 | if (CMAKE_BUILD_TYPE STREQUAL "Debug") | 34 | if (CMAKE_BUILD_TYPE STREQUAL "Debug") |
35 | message("Building as Debug") | 35 | message("Building as Debug") |
36 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -O0") | 36 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -O0") |
diff --git a/src/libwifi/core/frame/tag_iterator.c b/src/libwifi/core/frame/tag_iterator.c index c197752..662c2a2 100644 --- a/src/libwifi/core/frame/tag_iterator.c +++ b/src/libwifi/core/frame/tag_iterator.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | int libwifi_tag_iterator_init(struct libwifi_tag_iterator *it, const void *tags_start, size_t data_len) { | 22 | int libwifi_tag_iterator_init(struct libwifi_tag_iterator *it, const void *tags_start, size_t data_len) { |
23 | it->tag_header = (struct libwifi_tag_header *) tags_start; | 23 | it->tag_header = (struct libwifi_tag_header *) tags_start; |
24 | if (it->tag_header->tag_len < 0) { | 24 | if (it->tag_header->tag_len <= 0) { |
25 | return -EINVAL; | 25 | return -EINVAL; |
26 | } | 26 | } |
27 | 27 | ||
@@ -39,7 +39,7 @@ int libwifi_tag_iterator_next(struct libwifi_tag_iterator *it) { | |||
39 | } | 39 | } |
40 | 40 | ||
41 | it->tag_header = it->_next_tag_header; | 41 | it->tag_header = it->_next_tag_header; |
42 | if (it->tag_header->tag_len < 0) { | 42 | if (it->tag_header->tag_len <= 0) { |
43 | return -1; | 43 | return -1; |
44 | } | 44 | } |
45 | 45 | ||