jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

all: update clang-format settings

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2023-09-01 11:29:51 +02:00
parent a00687b092
commit 3c4b959f78
19 changed files with 119 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/membuffer.cpp
+2 -2
View File
@@ -146,8 +146,8 @@ void MemBuffer::fill(unsigned off, unsigned len, int value) {
// for use_simple_mcheck()
#define PTR_BITS32(p) ((unsigned) ((upx_uintptr_t) (p) &0xffffffff))
#define MAGIC1(p) ((PTR_BITS32(p) ^ 0xfefdbeeb) | 1)
#define MAGIC2(p) ((PTR_BITS32(p) ^ 0xfefdbeeb ^ 0x88224411) | 1)
#define MAGIC1(p) ((PTR_BITS32(p) ^ 0xfefdbeeb) | 1)
#define MAGIC2(p) ((PTR_BITS32(p) ^ 0xfefdbeeb ^ 0x88224411) | 1)
void MemBuffer::checkState() const {
if (!ptr)
src/util/membuffer.h
+1 -1
View File
@@ -131,7 +131,7 @@ inline typename MemBufferBase<T>::pointer raw_index_bytes(const MemBufferBase<T>
#define XSPAN_REQUIRES_CONVERTIBLE_ANY_DIRECTION(A, B, RType) \
typename std::enable_if<std::is_same<A, B>::value, RType>::type
#endif
#define C MemBufferBase
#define C MemBufferBase
#define XSPAN_FWD_C_IS_MEMBUFFER 1
#if WITH_XSPAN >= 1
#define D XSPAN_NS(Ptr)
src/util/snprintf.h
+2 -2
View File
@@ -53,8 +53,8 @@ upx_rsize_t upx_safe_strlen(const char *);
#undef snprintf
#undef sprintf
#undef vsnprintf
#define snprintf upx_safe_snprintf
#define sprintf ERROR_sprintf_IS_DANGEROUS_USE_snprintf
#define snprintf upx_safe_snprintf
#define sprintf ERROR_sprintf_IS_DANGEROUS_USE_snprintf
#define vsnprintf upx_safe_vsnprintf
/*************************************************************************
src/util/util.cpp
+10 -10
View File
@@ -29,10 +29,10 @@
#include <algorithm>
#define ACC_WANT_ACC_INCI_H 1
#include "../miniacc.h"
#define ACC_WANT_ACCLIB_GETOPT 1
#define ACC_WANT_ACCLIB_HSREAD 1
#define ACC_WANT_ACCLIB_MISC 1
#define ACC_WANT_ACCLIB_VGET 1
#define ACC_WANT_ACCLIB_GETOPT 1
#define ACC_WANT_ACCLIB_HSREAD 1
#define ACC_WANT_ACCLIB_MISC 1
#define ACC_WANT_ACCLIB_VGET 1
#define ACC_WANT_ACCLIB_WILDARGV 1
#undef HAVE_MKDIR
#include "../miniacc.h"
@@ -645,18 +645,18 @@ const LEPolicy le_policy;
ACC_OS_TOS || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
static const char dir_sep[] = "/\\";
#define fn_is_drive(s) (s[0] && s[1] == ':')
#define fn_is_sep(c) (strchr(dir_sep, c) != nullptr)
#define fn_is_drive(s) (s[0] && s[1] == ':')
#define fn_is_sep(c) (strchr(dir_sep, c) != nullptr)
#define fn_skip_drive(s) (fn_is_drive(s) ? (s) + 2 : (s))
#define fn_tolower(c) (tolower(((uchar) (c))))
#define fn_tolower(c) (tolower(((uchar) (c))))
#else
// static const char dir_sep[] = "/";
#define fn_is_drive(s) (0)
#define fn_is_sep(c) ((c) == '/')
#define fn_is_drive(s) (0)
#define fn_is_sep(c) ((c) == '/')
#define fn_skip_drive(s) (s)
#define fn_tolower(c) (c)
#define fn_tolower(c) (c)
#endif
src/util/xspan.h
+18 -18
View File
@@ -100,14 +100,14 @@ using XSPAN_NAMESPACE_NAME::raw_index_bytes; // overloaded for all classes
// unchecked - just a no-op pointer wrapper, no extra functionality
// types
#define XSPAN_0(type) Ptr<type>
#define XSPAN_P(type) Ptr<type>
#define XSPAN_S(type) Ptr<type>
#define XSPAN_0(type) Ptr<type>
#define XSPAN_P(type) Ptr<type>
#define XSPAN_S(type) Ptr<type>
// create a value
#define XSPAN_0_MAKE(type, first, ...) (XSPAN_0(type)((first)))
#define XSPAN_P_MAKE(type, first, ...) (XSPAN_P(type)((first)))
#define XSPAN_S_MAKE(type, first, ...) (XSPAN_S(type)((first)))
#define XSPAN_0_MAKE(type, first, ...) (XSPAN_0(type)((first)))
#define XSPAN_P_MAKE(type, first, ...) (XSPAN_P(type)((first)))
#define XSPAN_S_MAKE(type, first, ...) (XSPAN_S(type)((first)))
// define a variable
#define XSPAN_0_VAR(type, var, first, ...) XSPAN_0(type) var((first))
@@ -133,14 +133,14 @@ inline R *xspan_make_helper__(R * /*dummy*/, MemBuffer &mb) noexcept {
}
// types
#define XSPAN_0(type) type *
#define XSPAN_P(type) type *
#define XSPAN_S(type) type *
#define XSPAN_0(type) type *
#define XSPAN_P(type) type *
#define XSPAN_S(type) type *
// create a value
#define XSPAN_0_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_P_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_S_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_0_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_P_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
#define XSPAN_S_MAKE(type, first, ...) (xspan_make_helper__((type *) nullptr, (first)))
// define a variable
#define XSPAN_0_VAR(type, var, first, ...) type *var = XSPAN_0_MAKE(type, (first))
@@ -155,17 +155,17 @@ inline R *xspan_make_helper__(R * /*dummy*/, MemBuffer &mb) noexcept {
#if 1
// types
#define SPAN_0 XSPAN_0
#define SPAN_P XSPAN_P
#define SPAN_S XSPAN_S
#define SPAN_0 XSPAN_0
#define SPAN_P XSPAN_P
#define SPAN_S XSPAN_S
// create a value
#define SPAN_0_MAKE XSPAN_0_MAKE
#define SPAN_P_MAKE XSPAN_P_MAKE
#define SPAN_S_MAKE XSPAN_S_MAKE
// define a variable
#define SPAN_0_VAR XSPAN_0_VAR
#define SPAN_P_VAR XSPAN_P_VAR
#define SPAN_S_VAR XSPAN_S_VAR
#define SPAN_0_VAR XSPAN_0_VAR
#define SPAN_P_VAR XSPAN_P_VAR
#define SPAN_S_VAR XSPAN_S_VAR
#endif
/* vim:set ts=4 sw=4 et: */
src/util/xspan_impl.h
+4 -4
View File
@@ -29,14 +29,14 @@
#if WITH_XSPAN
#if 1
#define XSPAN_NAMESPACE_NAME XSpan
#define XSPAN_NAMESPACE_NAME XSpan
#define XSPAN_NAMESPACE_BEGIN namespace XSPAN_NAMESPACE_NAME {
#define XSPAN_NAMESPACE_END }
#define XSPAN_NS(x) XSPAN_NAMESPACE_NAME ::x
#define XSPAN_NAMESPACE_END }
#define XSPAN_NS(x) XSPAN_NAMESPACE_NAME ::x
#else
#define XSPAN_NAMESPACE_BEGIN /*empty*/
#define XSPAN_NAMESPACE_END /*empty*/
#define XSPAN_NS(x) ::x
#define XSPAN_NS(x) ::x
#endif
XSPAN_NAMESPACE_BEGIN