summaryrefslogtreecommitdiffstats
path: root/sal/rtl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-19 16:32:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-22 12:57:32 +0100
commitf853ec317f6af1b8c65cc5bd758371689c75118d (patch)
treeb86d729bf9a9465ee619ead3b5635efa62a1804e /sal/rtl
parenttdf#124513 let wizard reappear on tabbing back to document (diff)
downloadcore-f853ec317f6af1b8c65cc5bd758371689c75118d.tar.gz
core-f853ec317f6af1b8c65cc5bd758371689c75118d.zip
Extend loplugin:external to warn about classes
...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend loplugin:external to warn about enums". Cases where free functions were moved into an unnamed namespace along with a class, to not break ADL, are in: filter/source/svg/svgexport.cxx sc/source/filter/excel/xelink.cxx sc/source/filter/excel/xilink.cxx svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx All other free functions mentioning moved classes appear to be harmless and not give rise to (silent, even) ADL breakage. (One remaining TODO in compilerplugins/clang/external.cxx is that derived classes are not covered by computeAffectedTypes, even though they could also be affected by ADL-breakage--- but don't seem to be in any acutal case across the code base.) For friend declarations using elaborate type specifiers, like class C1 {}; class C2 { friend class C1; }; * If C2 (but not C1) is moved into an unnamed namespace, the friend declaration must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither qualified nor a template-id and the declaration is a function or an elaborated-type-specifier, the lookup to determine whether the entity has been previously declared shall not consider any scopes outside the innermost enclosing namespace.") * If C1 (but not C2) is moved into an unnamed namespace, the friend declaration must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882> "elaborated-type-specifier friend not looked up in unnamed namespace". Apart from that, to keep changes simple and mostly mechanical (which should help avoid regressions), out-of-line definitions of class members have been left in the enclosing (named) namespace. But explicit specializations of class templates had to be moved into the unnamed namespace to appease <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of template from unnamed namespace using unqualified-id in enclosing namespace". Also, accompanying declarations (of e.g. typedefs or static variables) that could arguably be moved into the unnamed namespace too have been left alone. And in some cases, mention of affected types in blacklists in other loplugins needed to be adapted. And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is not moved into an unnamed namespace (because it is declared in sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler doesn’t give this warning for types defined in the main .C file, as those are unlikely to have multiple definitions." (<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The warned-about classes also don't have multiple definitions in the given test, so disable the warning when including the .cxx. Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4 Reviewed-on: https://gerrit.libreoffice.org/83239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/alloc_arena.cxx4
-rw-r--r--sal/rtl/bootstrap.cxx12
-rw-r--r--sal/rtl/cipher.cxx12
-rw-r--r--sal/rtl/digest.cxx24
-rw-r--r--sal/rtl/hash.cxx4
-rw-r--r--sal/rtl/locale.cxx4
-rw-r--r--sal/rtl/random.cxx8
-rw-r--r--sal/rtl/uuid.cxx4
8 files changed, 68 insertions, 4 deletions
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 626d05c7b895..f126efdabd27 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -29,6 +29,8 @@
#include <string.h>
#include <stdio.h>
+namespace {
+
/**
@internal
*/
@@ -38,6 +40,8 @@ struct rtl_arena_list_st
rtl_arena_type m_arena_head;
};
+}
+
static rtl_arena_list_st g_arena_list;
/**
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 7f5d4317636a..dae54a88df66 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -55,11 +55,11 @@
using osl::DirectoryItem;
using osl::FileStatus;
-struct Bootstrap_Impl;
-
namespace
{
+struct Bootstrap_Impl;
+
static char const VND_SUN_STAR_PATHNAME[] = "vnd.sun.star.pathname:";
bool isPathnameUrl(OUString const & url)
@@ -111,8 +111,6 @@ OUString recursivelyExpandMacros(
return expandMacros(file, text, mode, &link);
}
-} // end namespace
-
struct rtl_bootstrap_NameValue
{
OUString sName;
@@ -126,6 +124,8 @@ struct rtl_bootstrap_NameValue
{}
};
+} // end namespace
+
typedef std::vector<rtl_bootstrap_NameValue> NameValueVector;
static bool find(
@@ -281,6 +281,8 @@ static void EnsureNoFinalSlash (OUString & url)
url = url.copy(0, i - 1);
}
+namespace {
+
struct Bootstrap_Impl
{
sal_Int32 _nRefCount;
@@ -313,6 +315,8 @@ struct Bootstrap_Impl
ExpandRequestLink const * requestStack) const;
};
+}
+
Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
: _nRefCount( 0 ),
_base_ini( nullptr ),
diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx
index 26d9cca29afc..9bc438114651 100644
--- a/sal/rtl/cipher.cxx
+++ b/sal/rtl/cipher.cxx
@@ -105,6 +105,8 @@ typedef rtlCipherError(cipher_update_t) (
typedef void (cipher_delete_t) (rtlCipher Cipher);
+namespace {
+
struct Cipher_Impl
{
rtlCipherAlgorithm m_algorithm;
@@ -117,6 +119,8 @@ struct Cipher_Impl
cipher_delete_t *m_delete;
};
+}
+
rtlCipher SAL_CALL rtl_cipher_create(
rtlCipherAlgorithm Algorithm,
rtlCipherMode Mode) SAL_THROW_EXTERN_C()
@@ -192,6 +196,8 @@ void SAL_CALL rtl_cipher_destroy(rtlCipher Cipher) SAL_THROW_EXTERN_C()
pImpl->m_delete(Cipher);
}
+namespace {
+
#if !defined LIBO_CIPHER_OPENSSL_BACKEND
#define CIPHER_ROUNDS_BF 16
@@ -223,6 +229,8 @@ struct CipherBF_Impl
CipherContextBF m_context;
};
+}
+
#if !defined LIBO_CIPHER_OPENSSL_BACKEND
static rtlCipherError BF_init(
CipherContextBF *ctx,
@@ -1150,6 +1158,8 @@ void SAL_CALL rtl_cipher_destroyBF(rtlCipher Cipher) SAL_THROW_EXTERN_C()
#define CIPHER_CBLOCK_ARCFOUR 256
#endif
+namespace {
+
struct ContextARCFOUR_Impl
{
#if defined LIBO_CIPHER_OPENSSL_BACKEND
@@ -1166,6 +1176,8 @@ struct CipherARCFOUR_Impl
ContextARCFOUR_Impl m_context;
};
+}
+
static rtlCipherError rtl_cipherARCFOUR_update_Impl(
ContextARCFOUR_Impl *ctx,
const sal_uInt8 *pData, sal_Size nDatLen,
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index 1000fc0aed02..55af5ad7c3b2 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -52,6 +52,8 @@ typedef rtlDigestError (Digest_update_t) (
typedef rtlDigestError (Digest_get_t) (
void *ctx, sal_uInt8 *Buffer, sal_uInt32 BufLen);
+namespace {
+
struct Digest_Impl
{
rtlDigestAlgorithm m_algorithm;
@@ -63,6 +65,8 @@ struct Digest_Impl
Digest_get_t *m_get;
};
+}
+
static void swapLong(sal_uInt32 *pData, sal_uInt32 nDatLen)
{
sal_uInt32 *X;
@@ -175,6 +179,8 @@ void SAL_CALL rtl_digest_destroy(rtlDigest Digest) SAL_THROW_EXTERN_C()
#define DIGEST_CBLOCK_MD2 16
#define DIGEST_LBLOCK_MD2 16
+namespace {
+
struct DigestContextMD2
{
sal_uInt32 m_nDatLen;
@@ -189,6 +195,8 @@ struct DigestMD2_Impl
DigestContextMD2 m_context;
};
+}
+
static void initMD2 (DigestContextMD2 *ctx);
static void updateMD2 (DigestContextMD2 *ctx);
static void endMD2 (DigestContextMD2 *ctx);
@@ -437,6 +445,8 @@ void SAL_CALL rtl_digest_destroyMD2(rtlDigest Digest) SAL_THROW_EXTERN_C()
#define DIGEST_CBLOCK_MD5 64
#define DIGEST_LBLOCK_MD5 16
+namespace {
+
struct DigestContextMD5
{
sal_uInt32 m_nDatLen;
@@ -451,6 +461,8 @@ struct DigestMD5_Impl
DigestContextMD5 m_context;
};
+}
+
static void initMD5 (DigestContextMD5 *ctx);
static void updateMD5 (DigestContextMD5 *ctx);
static void endMD5 (DigestContextMD5 *ctx);
@@ -824,6 +836,8 @@ typedef sal_uInt32 DigestSHA_update_t(sal_uInt32 x);
static sal_uInt32 updateSHA_0(sal_uInt32 x);
static sal_uInt32 updateSHA_1(sal_uInt32 x);
+namespace {
+
struct DigestContextSHA
{
DigestSHA_update_t *m_update;
@@ -839,6 +853,8 @@ struct DigestSHA_Impl
DigestContextSHA m_context;
};
+}
+
static void initSHA(
DigestContextSHA *ctx, DigestSHA_update_t *fct);
@@ -1390,6 +1406,8 @@ void SAL_CALL rtl_digest_destroySHA1(rtlDigest Digest) SAL_THROW_EXTERN_C()
#define DIGEST_CBLOCK_HMAC_MD5 64
+namespace {
+
struct ContextHMAC_MD5
{
DigestMD5_Impl m_hash;
@@ -1402,6 +1420,8 @@ struct DigestHMAC_MD5_Impl
ContextHMAC_MD5 m_context;
};
+}
+
static void initHMAC_MD5(ContextHMAC_MD5 * ctx);
static void ipadHMAC_MD5(ContextHMAC_MD5 * ctx);
static void opadHMAC_MD5(ContextHMAC_MD5 * ctx);
@@ -1586,6 +1606,8 @@ void SAL_CALL rtl_digest_destroyHMAC_MD5(rtlDigest Digest) SAL_THROW_EXTERN_C()
#define DIGEST_CBLOCK_HMAC_SHA1 64
+namespace {
+
struct ContextHMAC_SHA1
{
DigestSHA_Impl m_hash;
@@ -1598,6 +1620,8 @@ struct DigestHMAC_SHA1_Impl
ContextHMAC_SHA1 m_context;
};
+}
+
static void initHMAC_SHA1(ContextHMAC_SHA1 * ctx);
static void ipadHMAC_SHA1(ContextHMAC_SHA1 * ctx);
static void opadHMAC_SHA1(ContextHMAC_SHA1 * ctx);
diff --git a/sal/rtl/hash.cxx b/sal/rtl/hash.cxx
index 4cbe1da785c6..4fed60889f50 100644
--- a/sal/rtl/hash.cxx
+++ b/sal/rtl/hash.cxx
@@ -26,12 +26,16 @@
#include <osl/diagnose.h>
#include <sal/macros.h>
+namespace {
+
struct StringHashTableImpl {
sal_uInt32 nEntries;
sal_uInt32 nSize;
rtl_uString **pData;
};
+}
+
typedef StringHashTableImpl StringHashTable;
// Only for use in the implementation
diff --git a/sal/rtl/locale.cxx b/sal/rtl/locale.cxx
index e362a342bcbc..bae0f40b3d66 100644
--- a/sal/rtl/locale.cxx
+++ b/sal/rtl/locale.cxx
@@ -26,6 +26,8 @@
#include <memory>
#include <unordered_map>
+namespace {
+
struct locale_deleter
{
void operator() (rtl_Locale* p) noexcept
@@ -37,6 +39,8 @@ struct locale_deleter
}
};
+}
+
using locale_unique_ptr = std::unique_ptr<rtl_Locale, locale_deleter>;
static std::unordered_map<sal_Int32, locale_unique_ptr>* g_pLocaleTable = nullptr;
diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx
index c9cc0f841ea9..418358b22e22 100644
--- a/sal/rtl/random.cxx
+++ b/sal/rtl/random.cxx
@@ -46,6 +46,8 @@
if ((z) < 0) (z) += 30307; \
}
+namespace {
+
struct RandomData_Impl
{
sal_Int16 m_nX;
@@ -53,12 +55,16 @@ struct RandomData_Impl
sal_Int16 m_nZ;
};
+}
+
static double data (RandomData_Impl *pImpl);
#define RTL_RANDOM_DIGEST rtl_Digest_AlgorithmMD5
#define RTL_RANDOM_SIZE_DIGEST RTL_DIGEST_LENGTH_MD5
#define RTL_RANDOM_SIZE_POOL 1023
+namespace {
+
struct RandomPool_Impl
{
rtlDigest m_hDigest;
@@ -69,6 +75,8 @@ struct RandomPool_Impl
sal_uInt32 m_nCount;
};
+}
+
static bool initPool(RandomPool_Impl *pImpl);
static void seedPool(
diff --git a/sal/rtl/uuid.cxx b/sal/rtl/uuid.cxx
index bb9490ef8b99..130be12456d6 100644
--- a/sal/rtl/uuid.cxx
+++ b/sal/rtl/uuid.cxx
@@ -55,6 +55,8 @@
( ( static_cast<sal_uInt32>(p[3])) & 0xff);\
}
+namespace {
+
struct UUID
{
sal_uInt32 time_low;
@@ -65,6 +67,8 @@ struct UUID
sal_uInt8 node[6];
};
+}
+
static void write_v3( sal_uInt8 *pUuid )
{
UUID uuid;