diff --git a/ci-scripts/checkCodingFormattingRules.sh b/ci-scripts/checkCodingFormattingRules.sh index 2f2ae0c5bd..ffe978d30d 100755 --- a/ci-scripts/checkCodingFormattingRules.sh +++ b/ci-scripts/checkCodingFormattingRules.sh @@ -74,7 +74,7 @@ then IS_NFAPI=`echo $FILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true` IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FILE || true` IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FILE || true` - IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true` + IS_EXCEPTION=`echo $FILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true` if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] then if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ] @@ -184,7 +184,7 @@ do IS_NFAPI=`echo $FULLFILE | egrep -c "nfapi/open-nFAPI|nfapi/oai_integration/vendor_ext" || true` IS_OAI_LICENCE_PRESENT=`egrep -c "OAI Public License" $FULLFILE || true` IS_BSD_LICENCE_PRESENT=`egrep -c "the terms of the BSD Licence|License-Identifier: BSD-2-Clause" $FULLFILE || true` - IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true` + IS_EXCEPTION=`echo $FULLFILE | egrep -c "common/utils/collection/tree.h|common/utils/collection/queue.h|openair2/UTIL/OPT/packet-rohc.h|openair3/NAS/COMMON/milenage.h|openair1/PHY/CODING/crc.h|openair1/PHY/CODING/crcext.h|openair1/PHY/CODING/types.h|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c|openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_offload.h" || true` if [ $IS_OAI_LICENCE_PRESENT -eq 0 ] && [ $IS_BSD_LICENCE_PRESENT -eq 0 ] then if [ $IS_NFAPI -eq 0 ] && [ $IS_EXCEPTION -eq 0 ] diff --git a/common/utils/T/tracer/packet-mac-lte.h b/common/utils/T/tracer/packet-mac-lte.h index 60181987a9..715bbb68d9 100644 --- a/common/utils/T/tracer/packet-mac-lte.h +++ b/common/utils/T/tracer/packet-mac-lte.h @@ -17,8 +17,6 @@ #ifndef __COMMON_UTILS_T_TRACER_PACKET_MAC_LTE__H__ #define __COMMON_UTILS_T_TRACER_PACKET_MAC_LTE__H__ -//#include "ws_symbol_export.h" - /* radioType */ #define FDD_RADIO 1 #define TDD_RADIO 2 diff --git a/openair2/UTIL/OPT/ws_compiler_tests.h b/openair2/UTIL/OPT/ws_compiler_tests.h deleted file mode 100644 index 46a4ab6099..0000000000 --- a/openair2/UTIL/OPT/ws_compiler_tests.h +++ /dev/null @@ -1,138 +0,0 @@ -/* ws_compiler_tests.h - * - * Wireshark - Network traffic analyzer - * By Gerald Combs - * Copyright 1998 Gerald Combs - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef __WS_COMPILER_TESTS_H__ -#define __WS_COMPILER_TESTS_H__ - -/* - * This was introduced by Clang: - * - * http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute - * - * in some version (which version?); it has been picked up by GCC 5.0. - */ -#ifndef __has_attribute - /* - * It's a macro, so you can check whether it's defined to check - * whether it's supported. - * - * If it's not, define it to always return 0, so that we move on to - * the fallback checks. - */ - #define __has_attribute(x) 0 -#endif - -/* - * Note that the C90 spec's "6.8.1 Conditional inclusion" and the - * C99 spec's and C11 spec's "6.10.1 Conditional inclusion" say: - * - * Prior to evaluation, macro invocations in the list of preprocessing - * tokens that will become the controlling constant expression are - * replaced (except for those macro names modified by the defined unary - * operator), just as in normal text. If the token "defined" is - * generated as a result of this replacement process or use of the - * "defined" unary operator does not match one of the two specified - * forms prior to macro replacement, the behavior is undefined. - * - * so you shouldn't use defined() in a #define that's used in #if or - * #elif. Some versions of Clang, for example, will warn about this. - * - * Instead, we check whether the pre-defined macros for particular - * compilers are defined and, if not, define the "is this version XXX - * or a later version of this compiler" macros as 0. - */ - -/* - * Check whether this is GCC major.minor or a later release, or some - * compiler that claims to be "just like GCC" of that version or a - * later release. - */ - -#if !defined(__GNUC__) - #define WS_IS_AT_LEAST_GNUC_VERSION(major, minor) 0 -#else - #define WS_IS_AT_LEAST_GNUC_VERSION(major, minor) \ - (__GNUC__ > (major) || \ - (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))) -#endif - -/* - * Check whether this is Clang major.minor or a later release. - */ - -#if !defined(__clang__) - #define WS_IS_AT_LEAST_CLANG_VERSION(major, minor) 0 -#else - #define WS_IS_AT_LEAST_CLANG_VERSION(major, minor) \ - (__clang_major__ > (major) || \ - (__clang_major__ == (major) && __clang_minor__ >= (minor))) -#endif - -/* - * Check whether this is Sun C/SunPro C/Oracle Studio major.minor - * or a later release. - * - * The version number in __SUNPRO_C is encoded in hex BCD, with the - * uppermost hex digit being the major version number, the next - * one or two hex digits being the minor version number, and - * the last digit being the patch version. - * - * It represents the *compiler* version, not the product version; - * see - * - * https://sourceforge.net/p/predef/wiki/Compilers/ - * - * for a partial mapping, which we assume continues for later - * 12.x product releases. - */ - -#if !defined(__SUNPRO_C) - #define WS_IS_AT_LEAST_SUNC_VERSION(major, minor) 0 -#else - #define WS_SUNPRO_VERSION_TO_BCD(major, minor) \ - (((minor) >= 10) ? \ - (((major) << 12) | (((minor)/10) << 8) | (((minor)%10) << 4)) : \ - (((major) << 8) | ((minor) << 4))) - #define WS_IS_AT_LEAST_SUNC_VERSION(major, minor) \ - (__SUNPRO_C >= WS_SUNPRO_VERSION_TO_BCD((major), (minor))) -#endif - -/* - * Check whether this is IBM XL C major.minor or a later release. - * - * The version number in __xlC__ has the major version in the - * upper 8 bits and the minor version in the lower 8 bits. - */ - -#if !defined(__xlC__) - #define WS_IS_AT_LEAST_XL_C_VERSION(major, minor) 0 -#else - #define WS_IS_AT_LEAST_XL_C_VERSION(major, minor) \ - (__xlC__ >= (((major) << 8) | (minor))) -#endif - -/* - * Check whether this is HP aC++/HP C major.minor or a later release. - * - * The version number in __HP_aCC is encoded in zero-padded decimal BCD, - * with the "A." stripped off, the uppermost two decimal digits being - * the major version number, the next two decimal digits being the minor - * version number, and the last two decimal digits being the patch version. - * (Strip off the A., remove the . between the major and minor version - * number, and add two digits of patch.) - */ - -#if !defined(__HP_aCC) - #define WS_IS_AT_LEAST_HP_C_VERSION(major, minor) 0 -#else - #define WS_IS_AT_LEAST_HP_C_VERSION(major, minor) \ - (__HP_aCC >= ((major)*10000 + (minor)*100)) -#endif - -#endif /* __WS_COMPILER_TESTS_H__ */ diff --git a/openair2/UTIL/OPT/ws_symbol_export.h b/openair2/UTIL/OPT/ws_symbol_export.h deleted file mode 100644 index 4c7a2f710a..0000000000 --- a/openair2/UTIL/OPT/ws_symbol_export.h +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Cross platform defines for exporting symbols from shared libraries - * - * Wireshark - Network traffic analyzer - * By Balint Reczey - * Copyright 2013 Balint Reczey - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "ws_compiler_tests.h" - -/** Reset symbol export behavior. - * If you {un}define WS_BUILD_DLL on the fly you'll have to define this - * as well. - */ -#ifdef RESET_SYMBOL_EXPORT - -#ifdef SYMBOL_EXPORT_H -#undef SYMBOL_EXPORT_H -#endif - -#ifdef WS_DLL_PUBLIC -#undef WS_DLL_PUBLIC -#endif - -#ifdef WS_DLL_PUBLIC_DEF -#undef WS_DLL_PUBLIC_DEF -#endif - -#ifdef WS_DLL_LOCAL -#undef WS_DLL_LOCAL -#endif - -#endif /* RESET_SYMBOL_EXPORT */ - -#ifndef SYMBOL_EXPORT_H -#define SYMBOL_EXPORT_H - -/* - * NOTE: G_HAVE_GNUC_VISIBILITY is defined only if all of - * - * __attribute__ ((visibility ("hidden"))) - * - * __attribute__ ((visibility ("internal"))) - * - * __attribute__ ((visibility ("protected"))) - * - * __attribute__ ((visibility ("default"))) - * - * are supported, and at least some versions of GCC from Apple support - * "default" and "hidden" but not "internal" or "protected", so it - * shouldn't be used to determine whether "hidden" or "default" is - * supported. - * - * This also means that we shouldn't use G_GNUC_INTERNAL instead of - * WS_DLL_LOCAL, as GLib uses G_HAVE_GNUC_VISIBILITY to determine - * whether to use __attribute__ ((visibility ("hidden"))) for - * G_GNUC_INTERNAL, and that will not use it even with compilers - * that support it. - */ - -/* Originally copied from GCC Wiki at http://gcc.gnu.org/wiki/Visibility */ -#if defined _WIN32 || defined __CYGWIN__ - /* Compiling for Windows, so we use the Windows DLL declarations. */ - #ifdef WS_BUILD_DLL - /* - * Building a DLL; for all definitions, we want dllexport, and - * (presumably so source from DLL and source from a program using the - * DLL can both include a header that declares APIs and exported data - * for the DLL), for declarations, either dllexport or dllimport will - * work (they mean the same thing for a declaration when building a DLL). - */ - #ifdef __GNUC__ - /* GCC */ - #define WS_DLL_PUBLIC_DEF __attribute__ ((dllexport)) - #else /* ! __GNUC__ */ - /* - * Presumably MSVC. - * Note: actually gcc seems to also support this syntax. - */ - #define WS_DLL_PUBLIC_DEF __declspec(dllexport) - #endif /* __GNUC__ */ - #else /* WS_BUILD_DLL */ - /* - * Building a program; we should only see declarations, not definitions, - * with WS_DLL_PUBLIC, and they all represent APIs or data imported - * from a DLL, so use dllimport. - * - * For functions, export shouldn't be necessary; for data, it might - * be necessary, e.g. if what's declared is an array whose size is - * not given in the declaration. - */ - #ifdef __GNUC__ - /* GCC */ - #define WS_DLL_PUBLIC_DEF __attribute__ ((dllimport)) - #elif ! (defined ENABLE_STATIC) /* ! __GNUC__ */ - /* - * Presumably MSVC, and we're not building all-static. - * Note: actually gcc seems to also support this syntax. - */ - #define WS_DLL_PUBLIC_DEF __declspec(dllimport) - #else /* ! __GNUC__ && ENABLE_STATIC */ - /* - * Presumably MSVC, and we're building all-static, so we're - * not building any DLLs. - */ - #define WS_DLL_PUBLIC_DEF - #endif /* __GNUC__ */ - #endif /* WS_BUILD_DLL */ - - /* - * Symbols in a DLL are *not* exported unless they're specifically - * flagged as exported, so, for a non-static but non-exported - * symbol, we don't have to do anything. - */ - #define WS_DLL_LOCAL -#else /* defined _WIN32 || defined __CYGWIN__ */ - /* - * Compiling for UN*X, where the dllimport and dllexport stuff - * is neither necessary nor supported; just specify the - * visibility if we have a compiler that supports doing so. - */ - #if WS_IS_AT_LEAST_GNUC_VERSION(3,4) \ - || WS_IS_AT_LEAST_XL_C_VERSION(12,0) - /* - * GCC 3.4 or later, or some compiler asserting compatibility with - * GCC 3.4 or later, or XL C 13.0 or later, so we have - * __attribute__((visibility()). - */ - - /* - * Symbols exported from libraries. - */ - #define WS_DLL_PUBLIC_DEF __attribute__ ((visibility ("default"))) - - /* - * Non-static symbols *not* exported from libraries. - */ - #define WS_DLL_LOCAL __attribute__ ((visibility ("hidden"))) - #elif WS_IS_AT_LEAST_SUNC_VERSION(5,5) - /* - * Sun C 5.5 or later, so we have __global and __hidden. - * (Sun C 5.9 and later also have __attribute__((visibility()), - * but there's no reason to prefer it with Sun C.) - */ - - /* - * Symbols exported from libraries. - */ - #define WS_DLL_PUBLIC_DEF __global - - /* - * Non-static symbols *not* exported from libraries. - */ - #define WS_DLL_LOCAL __hidden - #else - /* - * We have neither a way to make stuff not explicitly marked as - * visible invisible outside a library nor a way to make stuff - * explicitly marked as local invisible outside the library. - */ - - /* - * Symbols exported from libraries. - */ - #define WS_DLL_PUBLIC_DEF - - /* - * Non-static symbols *not* exported from libraries. - */ - #define WS_DLL_LOCAL - #endif -#endif - -/* - * You *must* use this for exported data *declarations*; if you use - * WS_DLL_PUBLIC_DEF, some compilers, such as MSVC++, will complain - * about array definitions with no size. - * - * You must *not* use this for exported data *definitions*, as that - * will, for some compilers, cause warnings about items being initialized - * and declared extern. - * - * Either can be used for exported *function* declarations and definitions. - */ -#define WS_DLL_PUBLIC WS_DLL_PUBLIC_DEF extern - -#endif /* SYMBOL_EXPORT_H */ - -/* - * Editor modelines - http://www.wireshark.org/tools/modelines.html - * - * Local Variables: - * c-basic-offset: 2 - * tab-width: 8 - * indent-tabs-mode: nil - * End: - * - * vi: set shiftwidth=2 tabstop=8 expandtab: - * :indentSize=2:tabSize=8:noTabs=true: - */