Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-24 15:50:16 +01:00
Code Releases Wiki Activity

build: Build everything using -Wpedantic

Browse Source
This commit is contained in:
WerWolv 2023-01-04 14:03:09 +01:00
parent 496b0ec41d
commit f7dd28002e
12 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/build_helpers.cmake
View File

@ -383,7 +383,7 @@ function(downloadImHexPatternsFiles dest)
endfunction()
macro(setupCompilerWarnings target)
set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Werror")
set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror")
set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IMHEX_C_FLAGS}")
@ -409,7 +409,6 @@ macro(addBundledLibraries)
set(EXTERN_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external")
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Disable building of shared libraries")
add_subdirectory(${EXTERN_LIBS_FOLDER}/imgui)
set_target_properties(imgui PROPERTIES POSITION_INDEPENDENT_CODE ON)

2
lib/external/pattern_language vendored

@ -1 +1 @@
Subproject commit fb427b82a99076fdc3babaf0e2f5cb4717dac835
Subproject commit 4dec3adf6e2a8369569d64a6fe2c46b7c09f5943

25
lib/external/yara/CMakeLists.txt vendored
View File

@ -95,23 +95,24 @@ set(LIBYARA_MODULES
${LIBYARA_SOURCE_PATH}/modules/time/time.c
)
# Add mbedtls crypto wrappers
add_compile_definitions("HAVE_MBEDTLS")
add_compile_definitions("USE_NO_PROC")
add_compile_definitions("HASH_MODULE")
add_compile_definitions("DOTNET_MODULE")
add_compile_definitions("MAGIC_MODULE")
add_compile_definitions("MACHO_MODULE")
add_compile_definitions("DEX_MODULE")
find_package(mbedTLS 2.26.0 REQUIRED)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-shift-count-overflow")
add_library(libyara STATIC ${LIBYARA_SOURCE} ${LIBYARA_INCLUDES} ${LIBYARA_MODULES})
set_property(TARGET libyara PROPERTY POSITION_INDEPENDENT_CODE ON)
# Add mbedtls crypto wrappers
target_compile_definitions(libyara PRIVATE HAVE_MBEDTLS)
target_compile_definitions(libyara PRIVATE USE_NO_PROC)
target_compile_definitions(libyara PRIVATE HASH_MODULE)
target_compile_definitions(libyara PRIVATE DOTNET_MODULE)
target_compile_definitions(libyara PRIVATE MAGIC_MODULE)
target_compile_definitions(libyara PRIVATE MACHO_MODULE)
target_compile_definitions(libyara PRIVATE DEX_MODULE)
target_compile_options(libyara PRIVATE "-Wno-shift-count-overflow")
target_include_directories(
libyara
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/yara> $<BUILD_INTERFACE:${LIBYARA_SOURCE_PATH}/include> $<INSTALL_INTERFACE:include>

2
lib/libimhex/source/helpers/file.cpp
View File

@ -69,7 +69,7 @@ namespace hex::fs {
std::vector<u8> File::readBytes(size_t numBytes) {
if (!isValid()) return {};
auto size = numBytes ?: getSize();
auto size = numBytes == 0 ? getSize() : numBytes;
if (size == 0) return {};
std::vector<u8> bytes(size);

12
lib/libimhex/source/helpers/magic.cpp
View File

@ -57,8 +57,10 @@ namespace hex::magic {
magic_t ctx = magic_open(MAGIC_NONE);
ON_SCOPE_EXIT { magic_close(ctx); };
if (magic_load(ctx, magicFiles->c_str()) == 0)
return magic_buffer(ctx, data.data(), data.size()) ?: "";
if (magic_load(ctx, magicFiles->c_str()) == 0) {
if (auto result = magic_buffer(ctx, data.data(), data.size()); result != nullptr)
return result;
}
}
return "";
@ -78,8 +80,10 @@ namespace hex::magic {
magic_t ctx = magic_open(MAGIC_MIME_TYPE);
ON_SCOPE_EXIT { magic_close(ctx); };
if (magic_load(ctx, magicFiles->c_str()) == 0)
return magic_buffer(ctx, data.data(), data.size()) ?: "";
if (magic_load(ctx, magicFiles->c_str()) == 0) {
if (auto result = magic_buffer(ctx, data.data(), data.size()); result != nullptr)
return result;
}
}
return "";

5
lib/libimhex/source/helpers/utils.cpp
View File

@ -196,9 +196,10 @@ namespace hex {
return "Space";
case 127:
return "DEL";
case 128 ... 255:
return " ";
default:
if (c >= 128)
return " ";
else
return std::string() + static_cast<char>(c);
}
}

6
plugins/builtin/source/content/data_visualizers.cpp
View File

@ -91,10 +91,10 @@ namespace hex::plugin::builtin {
case 0xFF:
ImGui::TextDisabled("##");
break;
case ' ' ... '~':
ImGui::Text(".%c", c);
break;
default:
if (c >= ' ' && c <= '~')
ImGui::Text(".%c", c);
else
ImGui::Text(getFormatString(upperCase), c);
break;
}

21
plugins/builtin/source/content/views/view_find.cpp
View File

@ -415,11 +415,22 @@ namespace hex::plugin::builtin {
using enum SearchSettings::Value::Type;
using enum Occurrence::DecodeType;
case U8 ... U64: return Unsigned;
case I8 ... I64: return Signed;
case F32: return Float;
case F64: return Double;
default: return Binary;
case U8:
case U16:
case U32:
case U64:
return Unsigned;
case I8:
case I16:
case I32:
case I64:
return Signed;
case F32:
return Float;
case F64:
return Double;
default:
return Binary;
}
}();

5
plugins/builtin/source/content/views/view_yara.cpp
View File

@ -6,7 +6,12 @@
#include <hex/helpers/file.hpp>
#include <hex/helpers/fs.hpp>
// <yara/types.h>'s RE type has a zero-sized array, which is not allowed in ISO C++.
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <yara.h>
#pragma GCC diagnostic pop
#include <filesystem>
#include <thread>

2
tests/algorithms/CMakeLists.txt
View File

@ -37,7 +37,7 @@ add_executable(${PROJECT_NAME}
# ---- No need to change anything from here downwards unless you know what you're doing ---- #
target_include_directories(${PROJECT_NAME} PRIVATE include)
target_link_libraries(${PROJECT_NAME} libimhex tests_common)
target_link_libraries(${PROJECT_NAME} PRIVATE libimhex tests_common ${FMT_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

2
tests/common/CMakeLists.txt
View File

@ -6,4 +6,4 @@ add_library(tests_common STATIC
source/main.cpp
)
target_include_directories(tests_common PUBLIC include)
target_link_libraries(tests_common PUBLIC libimhex)
target_link_libraries(tests_common PUBLIC libimhex ${FMT_LIBRARIES})

2
tests/helpers/CMakeLists.txt
View File

@ -37,7 +37,7 @@ add_executable(${PROJECT_NAME}
# ---- No need to change anything from here downwards unless you know what you're doing ---- #
target_include_directories(${PROJECT_NAME} PRIVATE include)
target_link_libraries(${PROJECT_NAME} libimhex tests_common)
target_link_libraries(${PROJECT_NAME} PRIVATE libimhex tests_common ${FMT_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})