From d40ddfe15dacab59b2911b59adb0d087b94ccc03 Mon Sep 17 00:00:00 2001 From: Marc Date: Tue, 7 Dec 2021 18:41:53 +0000 Subject: build: Unset hard dependency on clang in CMake This commit also corrects a small warning for gcc. --- CMakeLists.txt | 16 ++++++++-------- 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) execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITBRANCH) execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH) execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME) -set(LIBWIFI_VERSION "0.0.1") +set(LIBWIFI_VERSION "0.0.2") + +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wno-language-extension-token") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes -Wstrict-prototypes") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") message(" ") message(" _ _ _ _ __ _ ") @@ -17,6 +23,7 @@ message("|_||_||_.__/ \\_/\\_/ |_||_| |_| ") message("-----------------------------------") message("802.11 Parsing / Generation Library") message("Version: ${LIBWIFI_VERSION}, Git: ${GITBRANCH} (${GITHASH}), Time: ${BUILDTIME}") +message("Compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}") message(" ") file(GLOB_RECURSE libwifi_src @@ -24,13 +31,6 @@ file(GLOB_RECURSE libwifi_src "src/libwifi/*.c" ) -set(CMAKE_C_COMPILER "/usr/bin/clang") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wno-language-extension-token") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes -Wstrict-prototypes") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") - if (CMAKE_BUILD_TYPE STREQUAL "Debug") message("Building as Debug") 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 @@ int libwifi_tag_iterator_init(struct libwifi_tag_iterator *it, const void *tags_start, size_t data_len) { it->tag_header = (struct libwifi_tag_header *) tags_start; - if (it->tag_header->tag_len < 0) { + if (it->tag_header->tag_len <= 0) { return -EINVAL; } @@ -39,7 +39,7 @@ int libwifi_tag_iterator_next(struct libwifi_tag_iterator *it) { } it->tag_header = it->_next_tag_header; - if (it->tag_header->tag_len < 0) { + if (it->tag_header->tag_len <= 0) { return -1; } -- cgit 1.4.1