walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added pcre support and changes to compile with clib2, although it is not 100% working now

This commit is contained in:
George Sokianos 2022-07-30 17:41:17 +01:00
parent 711137d3cd
commit be65971e97
7 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.os4
View File

@ -77,7 +77,7 @@ else # !WINNT
endif # !CPPCHK_GLIBCXX_DEBUG
endif # GNU/kFreeBSD
LDFLAGS=-lpthread -athread=native -gstabs
LDFLAGS=-lpthread
endif # WINNT
@ -101,8 +101,12 @@ ifndef CXXFLAGS
CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wno-deprecated-declarations -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar $(CPPCHK_GLIBCXX_DEBUG) -g
endif
override CXXFLAGS += -mcrt=newlib -athread=native -DNO_UNIX_SIGNAL_HANDLING -DUSE_THREADS -gstabs
# CXXFLAGS=-mcrt=newlib -athread=native -std=c++0x -O2 -DNDEBUG -DNO_UNIX_SIGNAL_HANDLING -DUSE_THREADS -Wall -Wno-sign-compare
MCRT := -mcrt=newlib
ifeq ($(USE_CLIB2), yes)
MCRT := -mcrt=clib2
endif
override CXXFLAGS +=$(MCRT) -O2 -athread=native -DNO_UNIX_SIGNAL_HANDLING -DUSE_THREADS
ifeq (g++, $(findstring g++,$(CXX)))
override CXXFLAGS += -std=gnu++0x
@ -115,11 +119,12 @@ else ifeq ($(CXX), c++)
endif
ifeq ($(HAVE_RULES),yes)
override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)
override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL
# $(shell pcre-config --cflags)
ifdef LIBS
LIBS += $(shell pcre-config --libs)
LIBS += -lpcre
else
LIBS=$(shell pcre-config --libs)
LIBS=-lpcre
endif
endif

2
cli/filelister.cpp
View File

@ -174,7 +174,7 @@ bool FileLister::fileExists(const std::string &path)
#endif
#endif
#if defined(__amigaos4__)
#if defined(__amigaos4__) && !defined(__CLIB2__)
static int readdir_r(DIR *dir, struct dirent *buf, struct dirent **result) {
struct dirent *de;

5
cli/main.cpp
View File

@ -80,6 +80,10 @@ static char exename[1024] = {0};
static char exename[1024] = {0};
#endif
#if defined(__amigaos4__)
static const char *stack __attribute__((used)) = "$STACK:102400";
static const char *version __attribute__((used)) = "\0$VER: cppcheck 2.9 (28.07.2022)";
#endif
/**
* Main function of cppcheck
*
@ -121,3 +125,4 @@ int main(int argc, char* argv[])
#endif
// *INDENT-ON*
}

3
externals/picojson/picojson.h vendored
View File

@ -196,7 +196,7 @@ namespace picojson {
if (
#ifdef _MSC_VER
! _finite(n)
#elif __cplusplus>=201103L || !(defined(isnan) && defined(isinf))
#elif (__cplusplus>=201103L || !(defined(isnan) && defined(isinf))) && !defined(__CLIB2__)
std::isnan(n) || std::isinf(n)
#else
isnan(n) || isinf(n)
@ -1008,3 +1008,4 @@ inline std::ostream& operator<<(std::ostream& os, const picojson::value& x)
#endif
#endif

1
lib/cppcheck.cpp
View File

@ -1757,3 +1757,4 @@ bool CppCheck::isUnusedFunctionCheckEnabled() const
{
return (mSettings.jobs == 1 && mSettings.checks.isEnabled(Checks::unusedFunction));
}

10
lib/mathlib.cpp
View File

@ -73,11 +73,18 @@ std::string MathLib::value::str() const
{
std::ostringstream ostr;
if (mType == MathLib::value::Type::FLOAT) {
#if defined(__amigaos4__) && defined(__CLIB2__)
if (isnan(mDoubleValue))
return "nan.0";
if (isinf(mDoubleValue))
return (mDoubleValue > 0) ? "inf.0" : "-inf.0";
#else
if (std::isnan(mDoubleValue))
return "nan.0";
if (std::isinf(mDoubleValue))
return (mDoubleValue > 0) ? "inf.0" : "-inf.0";
#endif
ostr.precision(9);
ostr << std::fixed << mDoubleValue;
@ -1298,3 +1305,4 @@ MathLib::value operator>>(const MathLib::value &v1, const MathLib::value &v2)
{
return v1.shiftRight(v2);
}

4
lib/platform.h
View File

@ -23,9 +23,9 @@
#include "config.h"
#if defined(__amigaos4__)
#if defined(__amigaos4__) && !defined(__CLIB2__)
#define stricmp strcasecmp
#endif
#endif /* amigaos4 */
#include <climits>
#include <string>