diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-01 19:53:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 07:09:56 +0200 |
commit | d563b9a5960e9bfe7077ee5aca44966d0bb3e2f1 (patch) | |
tree | 7d38488da147e8592ee70d8700ba702f2a626112 /sal/osl/unx | |
parent | 434391237010c94d54d89ad7f2ecef3638a772a0 (diff) |
Upcoming improved loplugin:staticanonymous -> redundantstatic: sal
Change-Id: I022f5ed37d25f2c8a8870033bab32ff59d4d8da6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97648
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal/osl/unx')
-rw-r--r-- | sal/osl/unx/nlsupport.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/pipe.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/process.cxx | 4 | ||||
-rw-r--r-- | sal/osl/unx/socket.cxx | 16 | ||||
-rw-r--r-- | sal/osl/unx/tempfile.cxx | 4 | ||||
-rw-r--r-- | sal/osl/unx/thread.cxx | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index a4c7c807c201..3a0b1021e726 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -294,7 +294,7 @@ static const Pair nl_language_list[] = { #elif defined(LINUX) -static const Pair nl_language_list[] = { +const Pair nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ { "ANSI_X3.4-1968", RTL_TEXTENCODING_ISO_8859_1 }, /* fake: ASCII_US */ { "ASMO_449", RTL_TEXTENCODING_DONTKNOW }, /* ISO_9036 ARABIC7 */ diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index ec9fe4b9d5ca..034979ba0e4e 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -41,7 +41,7 @@ static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Options, oslSecurity Security); -static struct +struct { int errcode; oslPipeError error; diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 39db4936fa3f..861324963dec 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -92,8 +92,8 @@ struct ProcessData oslFileHandle *m_pErrorRead; }; -static oslProcessImpl* ChildList; -static oslMutex ChildListMutex; +oslProcessImpl* ChildList; +oslMutex ChildListMutex; } //Anonymous namespace diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 4f67795a60ee..56a8f6cd63ac 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -94,7 +94,7 @@ /* Buffer size for getnameinfo */ #define MAX_HOSTBUFFER_SIZE 2048 -static const unsigned long FamilyMap[]= { +const unsigned long FamilyMap[]= { AF_INET, /* osl_Socket_FamilyInet */ AF_IPX, /* osl_Socket_FamilyIpx */ 0 /* osl_Socket_FamilyInvalid */ @@ -117,7 +117,7 @@ static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType) #define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y) #define FAMILY_TO_NATIVE(x) static_cast<short>(FamilyMap[x]) -static const sal_uInt32 ProtocolMap[]= { +const sal_uInt32 ProtocolMap[]= { 0, /* osl_Socket_ProtocolIp */ NSPROTO_IPX, /* osl_Socket_ProtocolIpx */ NSPROTO_SPX, /* osl_Socket_ProtocolSpx */ @@ -127,7 +127,7 @@ static const sal_uInt32 ProtocolMap[]= { #define PROTOCOL_TO_NATIVE(x) ProtocolMap[x] -static const sal_uInt32 TypeMap[]= { +const sal_uInt32 TypeMap[]= { SOCK_STREAM, /* osl_Socket_TypeStream */ SOCK_DGRAM, /* osl_Socket_TypeDgram */ SOCK_RAW, /* osl_Socket_TypeRaw */ @@ -153,7 +153,7 @@ static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType) #define TYPE_TO_NATIVE(x) TypeMap[x] #define TYPE_FROM_NATIVE(y) osl_SocketTypeFromNative(y) -static const sal_uInt32 OptionMap[]= { +const sal_uInt32 OptionMap[]= { SO_DEBUG, /* osl_Socket_OptionDebug */ SO_ACCEPTCONN, /* osl_Socket_OptionAcceptConn */ SO_REUSEADDR, /* osl_Socket_OptionReuseAddr */ @@ -177,7 +177,7 @@ static const sal_uInt32 OptionMap[]= { #define OPTION_TO_NATIVE(x) OptionMap[x] -static const sal_uInt32 OptionLevelMap[]= { +const sal_uInt32 OptionLevelMap[]= { SOL_SOCKET, /* osl_Socket_LevelSocket */ IPPROTO_TCP, /* osl_Socket_LevelTcp */ 0 /* osl_Socket_LevelInvalid */ @@ -185,7 +185,7 @@ static const sal_uInt32 OptionLevelMap[]= { #define OPTION_LEVEL_TO_NATIVE(x) OptionLevelMap[x] -static const sal_uInt32 SocketMsgFlagMap[]= { +const sal_uInt32 SocketMsgFlagMap[]= { 0, /* osl_Socket_MsgNormal */ MSG_OOB, /* osl_Socket_MsgOOB */ MSG_PEEK, /* osl_Socket_MsgPeek */ @@ -196,7 +196,7 @@ static const sal_uInt32 SocketMsgFlagMap[]= { #define MSG_FLAG_TO_NATIVE(x) SocketMsgFlagMap[x] -static const sal_uInt32 SocketDirection[]= { +const sal_uInt32 SocketDirection[]= { SD_RECEIVE, /* osl_Socket_DirRead */ SD_SEND, /* osl_Socket_DirWrite */ SD_BOTH, /* osl_Socket_DirReadWrite */ @@ -205,7 +205,7 @@ static const sal_uInt32 SocketDirection[]= { #define DIRECTION_TO_NATIVE(x) SocketDirection[x] -static const struct +const struct { int errcode; oslSocketError error; diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx index 84f44cbd4b32..01247ae24fe3 100644 --- a/sal/osl/unx/tempfile.cxx +++ b/sal/osl/unx/tempfile.cxx @@ -67,8 +67,8 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir ) * receives the random name ******************************************************************/ -static const char LETTERS[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; -static const int COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1; +const char LETTERS[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; +const int COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1; #define RAND_NAME_LENGTH 6 diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index ab19bdc8aa5b..2472efec8618 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -590,7 +590,7 @@ struct HashEntry } static HashEntry* HashTable[31]; -static const int HashSize = SAL_N_ELEMENTS(HashTable); +const int HashSize = SAL_N_ELEMENTS(HashTable); static pthread_mutex_t HashLock = PTHREAD_MUTEX_INITIALIZER; |