[Libreoffice-commits] core.git: 7 commits - sal/osl
Chris Sherlock
chris.sherlock79 at gmail.com
Sat Jul 22 10:44:40 UTC 2017
sal/osl/w32/profile.cxx | 46 ++------
sal/osl/w32/salinit.cxx | 4
sal/osl/w32/secimpl.hxx | 2
sal/osl/w32/security.cxx | 81 ++++++--------
sal/osl/w32/socket.cxx | 254 +++--------------------------------------------
sal/osl/w32/sockimpl.hxx | 3
sal/osl/w32/time.cxx | 10 -
7 files changed, 67 insertions(+), 333 deletions(-)
New commits:
commit 4f5238deaca3e565e56adefb6b4805cb2c571ed4
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 22 20:41:40 2017 +1000
osl: get rid of comment cruft in w32/time.cxx
Change-Id: Ief31a90cb0d14ac396be4d11719f8deb136b081d
diff --git a/sal/osl/w32/time.cxx b/sal/osl/w32/time.cxx
index 11ce61539db3..1a6e6ceaa181 100644
--- a/sal/osl/w32/time.cxx
+++ b/sal/osl/w32/time.cxx
@@ -27,8 +27,6 @@
#include <osl/time.h>
#include <sys/timeb.h>
-// osl_getSystemTime
-
sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
{
SYSTEMTIME SystemTime;
@@ -78,8 +76,6 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* pTimeVal)
return true;
}
-// osl_getDateTimeFromTimeValue
-
sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDateTime* pDateTime )
{
FILETIME aFileTime;
@@ -106,8 +102,6 @@ sal_Bool SAL_CALL osl_getDateTimeFromTimeValue( const TimeValue* pTimeVal, oslDa
return false;
}
-// osl_getTimeValueFromDateTime
-
sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, TimeValue* pTimeVal )
{
FILETIME aFileTime;
@@ -134,8 +128,6 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const oslDateTime* pDateTime, Ti
return false;
}
-// osl_getLocalTimeFromSystemTime
-
sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVal, TimeValue* pLocalTimeVal )
{
TIME_ZONE_INFORMATION aTimeZoneInformation;
@@ -163,8 +155,6 @@ sal_Bool SAL_CALL osl_getLocalTimeFromSystemTime( const TimeValue* pSystemTimeVa
return false;
}
-// osl_getSystemTimeFromLocalTime
-
sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( const TimeValue* pLocalTimeVal, TimeValue* pSystemTimeVal )
{
TIME_ZONE_INFORMATION aTimeZoneInformation;
commit 198cc058d0ced75e790ad7a6f0cc47a81adf8c13
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 22 20:40:27 2017 +1000
osl: get rid of comment cruft in w32/sockimpl.hxx
Change-Id: Iab2ac765435113b8776be6b6a632e21385b02fae
diff --git a/sal/osl/w32/sockimpl.hxx b/sal/osl/w32/sockimpl.hxx
index d052d9fb7381..44aeced6b3e6 100644
--- a/sal/osl/w32/sockimpl.hxx
+++ b/sal/osl/w32/sockimpl.hxx
@@ -23,9 +23,6 @@
#include <osl/socket.h>
#include <osl/interlck.h>
-/*****************************************************************************/
-/* oslSocketImpl */
-/*****************************************************************************/
#define OSL_SOCKET_FLAGS_NONBLOCKING 0x0001
struct oslSocketImpl {
commit a12913fc442d8b81b2738e80a5a47fbe700c64dc
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 22 20:39:46 2017 +1000
osl: get rid of comment cruft in w32/socket.cxx
Change-Id: Ide9debe3e1029646b01ba7698e2c613ba0040bed
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 943fead18a9a..d1086cbaca4b 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -55,18 +55,12 @@
#define OSL_INVALID_SOCKET INVALID_SOCKET /* WIN32 */
#define OSL_SOCKET_ERROR SOCKET_ERROR /* WIN32 */
-/*****************************************************************************/
-/* enum oslAddrFamily */
-/*****************************************************************************/
-
-/* map */
static DWORD FamilyMap[]= {
AF_INET, /* osl_Socket_FamilyInet */
AF_IPX, /* osl_Socket_FamilyIpx */
0 /* osl_Socket_FamilyInvalid */
};
-/* reverse map */
static oslAddrFamily osl_AddrFamilyFromNative(DWORD nativeType)
{
oslAddrFamily i= (oslAddrFamily) 0;
@@ -79,15 +73,9 @@ static oslAddrFamily osl_AddrFamilyFromNative(DWORD nativeType)
return i;
}
-/* macros */
#define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y)
#define FAMILY_TO_NATIVE(x) (short)FamilyMap[x]
-/*****************************************************************************/
-/* enum oslProtocol */
-/*****************************************************************************/
-
-/* map */
static DWORD ProtocolMap[]= {
0, /* osl_Socket_FamilyInet */
NSPROTO_IPX, /* osl_Socket_FamilyIpx */
@@ -96,14 +84,8 @@ static DWORD ProtocolMap[]= {
0 /* osl_Socket_ProtocolInvalid */
};
-/* macros */
#define PROTOCOL_TO_NATIVE(x) ProtocolMap[x]
-/*****************************************************************************/
-/* enum oslSocketType */
-/*****************************************************************************/
-
-/* map */
static DWORD TypeMap[]= {
SOCK_STREAM, /* osl_Socket_TypeStream */
SOCK_DGRAM, /* osl_Socket_TypeDgram */
@@ -113,7 +95,6 @@ static DWORD TypeMap[]= {
0 /* osl_Socket_TypeInvalid */
};
-/* reverse map */
static oslSocketType osl_SocketTypeFromNative(DWORD nativeType)
{
oslSocketType i= (oslSocketType)0;
@@ -126,15 +107,9 @@ static oslSocketType osl_SocketTypeFromNative(DWORD nativeType)
return i;
}
-/* macros */
#define TYPE_TO_NATIVE(x) TypeMap[x]
#define TYPE_FROM_NATIVE(y) osl_SocketTypeFromNative(y)
-/*****************************************************************************/
-/* enum oslSocketOption */
-/*****************************************************************************/
-
-/* map */
static DWORD OptionMap[]= {
SO_DEBUG, /* osl_Socket_OptionDebug */
SO_ACCEPTCONN, /* osl_Socket_OptionAcceptConn */
@@ -157,26 +132,16 @@ static DWORD OptionMap[]= {
0 /* osl_Socket_OptionInvalid */
};
-/* macros */
#define OPTION_TO_NATIVE(x) OptionMap[x]
-/*****************************************************************************/
-/* enum oslSocketOptionLevel */
-/*****************************************************************************/
-
static DWORD OptionLevelMap[]= {
SOL_SOCKET, /* osl_Socket_LevelSocket */
IPPROTO_TCP, /* osl_Socket_LevelTcp */
0 /* osl_invalid_SocketLevel */
};
-/* macros */
#define OPTION_LEVEL_TO_NATIVE(x) OptionLevelMap[x]
-/*****************************************************************************/
-/* enum oslSocketMsgFlag */
-/*****************************************************************************/
-
static DWORD SocketMsgFlagMap[]= {
0, /* osl_Socket_MsgNormal */
MSG_OOB, /* osl_Socket_MsgOOB */
@@ -185,50 +150,37 @@ static DWORD SocketMsgFlagMap[]= {
MSG_MAXIOVLEN /* osl_Socket_MsgMaxIOVLen */
};
-/* macros */
#define MSG_FLAG_TO_NATIVE(x) SocketMsgFlagMap[x]
-/*****************************************************************************/
-/* enum oslSocketDirection */
-/*****************************************************************************/
-
static DWORD SocketDirection[]= {
SD_RECEIVE, /* osl_Socket_DirRead */
SD_SEND, /* osl_Socket_DirWrite */
SD_BOTH /* osl_Socket_DirReadwrite */
};
-/* macros */
#define DIRECTION_TO_NATIVE(x) SocketDirection[x]
-/*****************************************************************************/
-/* enum oslSocketError */
-/*****************************************************************************/
-
static int SocketError[]= {
-
- 0, /* no error */
+ 0, /* no error */
WSAENOTSOCK, /* Socket operation on non-socket */
WSAEDESTADDRREQ, /* Destination address required */
WSAEMSGSIZE, /* Message too long */
WSAEPROTOTYPE, /* Protocol wrong type for socket */
- WSAENOPROTOOPT, /* Protocol not available */
- WSAEPROTONOSUPPORT, /* Protocol not supported */
- WSAESOCKTNOSUPPORT, /* Socket type not supported */
+ WSAENOPROTOOPT, /* Protocol not available */
+ WSAEPROTONOSUPPORT, /* Protocol not supported */
+ WSAESOCKTNOSUPPORT, /* Socket type not supported */
WSAEOPNOTSUPP, /* Operation not supported on socket */
WSAEPFNOSUPPORT, /* Protocol family not supported */
- WSAEAFNOSUPPORT, /* Address family not supported by */
- /* protocol family */
+ WSAEAFNOSUPPORT, /* Address family not supported by protocol family */
WSAEADDRINUSE, /* Address already in use */
WSAEADDRNOTAVAIL, /* Can't assign requested address */
WSAENETDOWN, /* Network is down */
- WSAENETUNREACH, /* Network is unreachable */
- WSAENETRESET, /* Network dropped connection because */
- /* of reset */
+ WSAENETUNREACH, /* Network is unreachable */
+ WSAENETRESET, /* Network dropped connection because of reset */
WSAECONNABORTED, /* Software caused connection abort */
WSAECONNRESET, /* Connection reset by peer */
- WSAENOBUFS, /* No buffer space available */
- WSAEISCONN, /* Socket is already connected */
+ WSAENOBUFS, /* No buffer space available */
+ WSAEISCONN, /* Socket is already connected */
WSAENOTCONN, /* Socket is not connected */
WSAESHUTDOWN, /* Can't send after socket shutdown */
WSAETOOMANYREFS, /* Too many references: can't splice */
@@ -236,12 +188,11 @@ static int SocketError[]= {
WSAECONNREFUSED, /* Connection refused */
WSAEHOSTDOWN, /* Host is down */
WSAEHOSTUNREACH, /* No route to host */
- WSAEWOULDBLOCK, /* call would block on non-blocking socket */
+ WSAEWOULDBLOCK, /* call would block on non-blocking socket */
WSAEALREADY, /* operation already in progress */
- WSAEINPROGRESS /* operation now in progress */
+ WSAEINPROGRESS /* operation now in progress */
};
-/* reverse map */
static oslSocketError osl_SocketErrorFromNative(int nativeType)
{
oslSocketError i= (oslSocketError)0;
@@ -256,12 +207,8 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType)
return i;
}
-/* macros */
#define ERROR_FROM_NATIVE(y) osl_SocketErrorFromNative(y)
-/*****************************************************************************/
-/* oslSocketImpl */
-/*****************************************************************************/
#if OSL_DEBUG_LEVEL > 0
static sal_uInt32 g_nSocketAddr = 0;
struct LeakWarning
@@ -289,7 +236,7 @@ void osl_destroySocketImpl_(oslSocketImpl *pImpl)
rtl_freeMemory (pImpl);
}
}
-/*****************************************************************************/
+
static oslSocketAddr osl_createSocketAddr_( )
{
oslSocketAddr pAddr = static_cast<oslSocketAddr>(rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl )));
@@ -337,30 +284,21 @@ static void osl_destroySocketAddr_( oslSocketAddr addr )
#endif
rtl_freeMemory( addr );
}
-/*****************************************************************************/
-/* osl_createEmptySocketAddr */
-/*****************************************************************************/
+
oslSocketAddr SAL_CALL osl_createEmptySocketAddr(oslAddrFamily Family)
{
oslSocketAddr pAddr = nullptr;
/* is it an internet-Addr? */
if (Family == osl_Socket_FamilyInet)
- {
pAddr = osl_createSocketAddrWithFamily_(Family, 0 , htonl(INADDR_ANY) );
- }
else
- {
pAddr = osl_createSocketAddrWithFamily_( Family , 0 , 0 );
- }
return pAddr;
}
-/*****************************************************************************/
-/* osl_copySocketAddr */
-/*****************************************************************************/
-// @deprecated, to be removed
+/** @deprecated, to be removed */
oslSocketAddr SAL_CALL osl_copySocketAddr(oslSocketAddr Addr)
{
oslSocketAddr pCopy = nullptr;
@@ -374,9 +312,6 @@ oslSocketAddr SAL_CALL osl_copySocketAddr(oslSocketAddr Addr)
return pCopy;
}
-/*****************************************************************************/
-/* osl_isEqualSocketAddr */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2)
{
OSL_ASSERT(Addr1);
@@ -413,9 +348,6 @@ sal_Bool SAL_CALL osl_isEqualSocketAddr(oslSocketAddr Addr1, oslSocketAddr Addr2
return false;
}
-/*****************************************************************************/
-/* osl_createInetBroadcastAddr */
-/*****************************************************************************/
oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
rtl_uString *strDottedAddr,
sal_Int32 Port)
@@ -464,9 +396,6 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
return pAddr;
}
-/*****************************************************************************/
-/* osl_createInetSocketAddr */
-/*****************************************************************************/
oslSocketAddr SAL_CALL osl_createInetSocketAddr (
rtl_uString *strDottedAddr,
sal_Int32 Port)
@@ -520,17 +449,11 @@ oslSocketResult SAL_CALL osl_getAddrOfSocketAddr( oslSocketAddr pAddr, sal_Seque
return res;
}
-/*****************************************************************************/
-/* oslHostAddr */
-/*****************************************************************************/
struct oslHostAddrImpl {
rtl_uString *pHostName;
oslSocketAddr pSockAddr;
} ;
-/*****************************************************************************/
-/* osl_createHostAddr */
-/*****************************************************************************/
oslHostAddr SAL_CALL osl_createHostAddr (
rtl_uString *strHostname,
const oslSocketAddr pSocketAddr)
@@ -563,9 +486,6 @@ oslHostAddr SAL_CALL osl_createHostAddr (
return pAddr;
}
-/*****************************************************************************/
-/* osl_createHostAddrByName */
-/*****************************************************************************/
oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *strHostname)
{
if ((strHostname == nullptr) || (strHostname->length == 0))
@@ -600,9 +520,6 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *strHostname)
return nullptr;
}
-/*****************************************************************************/
-/* osl_createHostAddrByAddr */
-/*****************************************************************************/
oslHostAddr SAL_CALL osl_createHostAddrByAddr(const oslSocketAddr pAddr)
{
if (pAddr == nullptr)
@@ -640,9 +557,6 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr(const oslSocketAddr pAddr)
return nullptr;
}
-/*****************************************************************************/
-/* osl_copyHostAddr */
-/*****************************************************************************/
oslHostAddr SAL_CALL osl_copyHostAddr(const oslHostAddr Addr)
{
oslHostAddr pAddr = Addr;
@@ -653,9 +567,6 @@ oslHostAddr SAL_CALL osl_copyHostAddr(const oslHostAddr Addr)
return nullptr;
}
-/*****************************************************************************/
-/* osl_getHostnameOfHostAddr */
-/*****************************************************************************/
void SAL_CALL osl_getHostnameOfHostAddr(
const oslHostAddr pAddr, rtl_uString **strHostname)
{
@@ -665,9 +576,6 @@ void SAL_CALL osl_getHostnameOfHostAddr(
rtl_uString_new (strHostname);
}
-/*****************************************************************************/
-/* osl_getSocketAddrOfHostAddr */
-/*****************************************************************************/
oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr(const oslHostAddr pAddr)
{
if (pAddr)
@@ -676,9 +584,6 @@ oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr(const oslHostAddr pAddr)
return nullptr;
}
-/*****************************************************************************/
-/* osl_destroyHostAddr */
-/*****************************************************************************/
void SAL_CALL osl_destroyHostAddr(oslHostAddr pAddr)
{
if (pAddr)
@@ -692,9 +597,6 @@ void SAL_CALL osl_destroyHostAddr(oslHostAddr pAddr)
}
}
-/*****************************************************************************/
-/* osl_getLocalHostname */
-/*****************************************************************************/
oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname)
{
static sal_Unicode LocalHostname[256] = {0};
@@ -738,9 +640,6 @@ oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname)
return osl_Socket_Error;
}
-/*****************************************************************************/
-/* osl_resolveHostname */
-/*****************************************************************************/
oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString* strHostname)
{
oslHostAddr pAddr = osl_createHostAddrByName (strHostname);
@@ -753,9 +652,6 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString* strHostname)
return nullptr;
}
-/*****************************************************************************/
-/* osl_getServicePort */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_getServicePort (
rtl_uString* strServicename,
rtl_uString* strProtocol)
@@ -789,17 +685,11 @@ sal_Int32 SAL_CALL osl_getServicePort (
return OSL_INVALID_PORT;
}
-/*****************************************************************************/
-/* osl_destroySocketAddr */
-/*****************************************************************************/
void SAL_CALL osl_destroySocketAddr(oslSocketAddr pAddr)
{
osl_destroySocketAddr_( pAddr );
}
-/*****************************************************************************/
-/* osl_getFamilyOfSocketAddr */
-/*****************************************************************************/
oslAddrFamily SAL_CALL osl_getFamilyOfSocketAddr(oslSocketAddr pAddr)
{
if (pAddr)
@@ -808,9 +698,6 @@ oslAddrFamily SAL_CALL osl_getFamilyOfSocketAddr(oslSocketAddr pAddr)
return osl_Socket_FamilyInvalid;
}
-/*****************************************************************************/
-/* osl_getInetPortOfSocketAddr */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(oslSocketAddr pAddr)
{
if( pAddr )
@@ -823,9 +710,6 @@ sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(oslSocketAddr pAddr)
return OSL_INVALID_PORT;
}
-/*****************************************************************************/
-/* osl_setInetPortOfSocketAddr */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_setInetPortOfSocketAddr (
oslSocketAddr pAddr,
sal_Int32 Port)
@@ -842,9 +726,6 @@ sal_Bool SAL_CALL osl_setInetPortOfSocketAddr (
return true;
}
-/*****************************************************************************/
-/* osl_getHostnameOfSocketAddr */
-/*****************************************************************************/
oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr (
oslSocketAddr Addr,
rtl_uString **strHostName)
@@ -863,9 +744,6 @@ oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr (
return osl_Socket_Error;
}
-/*****************************************************************************/
-/* osl_getDottedInetAddrOfSocketAddr */
-/*****************************************************************************/
oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr (
oslSocketAddr pAddr,
rtl_uString **strDottedInetAddr)
@@ -893,9 +771,6 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr (
return osl_Socket_Ok;
}
-/*****************************************************************************/
-/* osl_createSocket */
-/*****************************************************************************/
oslSocket SAL_CALL osl_createSocket (
oslAddrFamily Family,
oslSocketType Type,
@@ -940,9 +815,6 @@ void SAL_CALL osl_releaseSocket( oslSocket pSocket )
}
}
-/*****************************************************************************/
-/* osl_closeSocket */
-/*****************************************************************************/
void SAL_CALL osl_closeSocket(oslSocket pSocket)
{
/* socket already invalid */
@@ -955,12 +827,11 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
pSocket->m_Socket = OSL_INVALID_SOCKET;
}
-/*****************************************************************************/
-/* osl_getLocalAddrOfSocket */
-/* Note that I rely on the fact that oslSocketAddr and struct sockaddr */
-/* are the same! I don't like it very much but see no other easy way */
-/* to conceal the struct sockaddr from the eyes of the user. */
-/*****************************************************************************/
+/**
+ Note that I rely on the fact that oslSocketAddr and struct sockaddr
+ are the same! I don't like it very much but see no other easy way
+ to conceal the struct sockaddr from the eyes of the user.
+*/
oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
{
struct sockaddr Addr;
@@ -978,9 +849,6 @@ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
return pAddr;
}
-/*****************************************************************************/
-/* osl_getPeerAddrOfSocket */
-/*****************************************************************************/
oslSocketAddr SAL_CALL osl_getPeerAddrOfSocket(oslSocket pSocket)
{
struct sockaddr Addr;
@@ -998,9 +866,6 @@ oslSocketAddr SAL_CALL osl_getPeerAddrOfSocket(oslSocket pSocket)
return pAddr;
}
-/*****************************************************************************/
-/* osl_bindAddrToSocket */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_bindAddrToSocket ( oslSocket pSocket, oslSocketAddr pAddr)
{
OSL_ASSERT( pAddr );
@@ -1013,9 +878,6 @@ sal_Bool SAL_CALL osl_bindAddrToSocket ( oslSocket pSocket, oslSocketAddr pAddr)
sizeof(struct sockaddr)) != OSL_SOCKET_ERROR);
}
-/*****************************************************************************/
-/* osl_connectSocketTo */
-/*****************************************************************************/
oslSocketResult SAL_CALL osl_connectSocketTo (
oslSocket pSocket,
oslSocketAddr pAddr,
@@ -1145,9 +1007,6 @@ oslSocketResult SAL_CALL osl_connectSocketTo (
}
}
-/*****************************************************************************/
-/* osl_listenOnSocket */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_listenOnSocket (
oslSocket pSocket,
sal_Int32 MaxPendingConnections)
@@ -1161,9 +1020,6 @@ sal_Bool SAL_CALL osl_listenOnSocket (
MaxPendingConnections) != OSL_SOCKET_ERROR);
}
-/*****************************************************************************/
-/* osl_acceptConnectionOnSocket */
-/*****************************************************************************/
oslSocket SAL_CALL osl_acceptConnectionOnSocket (
oslSocket pSocket,
oslSocketAddr* ppAddr)
@@ -1211,9 +1067,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket (
return pConnectionSocket;
}
-/*****************************************************************************/
-/* osl_receiveSocket */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_receiveSocket (
oslSocket pSocket,
void* pBuffer,
@@ -1229,9 +1082,6 @@ sal_Int32 SAL_CALL osl_receiveSocket (
MSG_FLAG_TO_NATIVE(Flag));
}
-/*****************************************************************************/
-/* osl_receiveFromSocket */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_receiveFromSocket (
oslSocket pSocket,
oslSocketAddr SenderAddr,
@@ -1258,9 +1108,6 @@ sal_Int32 SAL_CALL osl_receiveFromSocket (
&AddrLen);
}
-/*****************************************************************************/
-/* osl_sendSocket */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_sendSocket (
oslSocket pSocket,
const void* pBuffer,
@@ -1276,9 +1123,6 @@ sal_Int32 SAL_CALL osl_sendSocket (
MSG_FLAG_TO_NATIVE(Flag));
}
-/*****************************************************************************/
-/* osl_sendToSocket */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_sendToSocket (
oslSocket pSocket,
oslSocketAddr ReceiverAddr,
@@ -1304,9 +1148,6 @@ sal_Int32 SAL_CALL osl_sendToSocket (
pSystemSockAddr == nullptr ? 0 : sizeof(struct sockaddr));
}
-/*****************************************************************************/
-/* osl_readSocket */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_readSocket( oslSocket pSocket, void *pBuffer, sal_Int32 n )
{
sal_uInt8 * Ptr = static_cast<sal_uInt8 *>(pBuffer);
@@ -1338,9 +1179,6 @@ sal_Int32 SAL_CALL osl_readSocket( oslSocket pSocket, void *pBuffer, sal_Int32 n
return BytesRead;
}
-/*****************************************************************************/
-/* osl_writeSocket */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_Int32 n )
{
OSL_ASSERT( pSocket );
@@ -1369,9 +1207,6 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_
return BytesSend;
}
-/*****************************************************************************/
-/* osl_isReceiveReady */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_isReceiveReady (
oslSocket pSocket,
const TimeValue* pTimeout)
@@ -1427,9 +1262,6 @@ sal_Bool SAL_CALL osl_isSendReady (
(pTimeout) ? &tv : nullptr)==1); /* use timeout? */
}
-/*****************************************************************************/
-/* osl_isExceptionPending */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_isExceptionPending (
oslSocket pSocket,
const TimeValue* pTimeout)
@@ -1456,9 +1288,6 @@ sal_Bool SAL_CALL osl_isExceptionPending (
(pTimeout) ? &tv : nullptr)==1); /* use timeout? */
}
-/*****************************************************************************/
-/* osl_shutdownSocket */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_shutdownSocket (
oslSocket pSocket,
oslSocketDirection Direction)
@@ -1469,9 +1298,6 @@ sal_Bool SAL_CALL osl_shutdownSocket (
return (shutdown(pSocket->m_Socket, DIRECTION_TO_NATIVE(Direction))==0);
}
-/*****************************************************************************/
-/* osl_getSocketOption */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_getSocketOption (
oslSocket pSocket,
oslSocketOptionLevel Level,
@@ -1495,9 +1321,6 @@ sal_Int32 SAL_CALL osl_getSocketOption (
return len;
}
-/*****************************************************************************/
-/* osl_setSocketOption */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_setSocketOption (
oslSocket pSocket,
oslSocketOptionLevel Level,
@@ -1515,9 +1338,6 @@ sal_Bool SAL_CALL osl_setSocketOption (
BufferLen) == 0);
}
-/*****************************************************************************/
-/* osl_enableNonBlockingMode */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_enableNonBlockingMode ( oslSocket pSocket, sal_Bool On)
{
unsigned long Param= On ? 1 : 0;
@@ -1533,9 +1353,6 @@ sal_Bool SAL_CALL osl_enableNonBlockingMode ( oslSocket pSocket, sal_Bool On)
ioctlsocket(pSocket->m_Socket, FIONBIO, &Param) != OSL_SOCKET_ERROR);
}
-/*****************************************************************************/
-/* osl_isNonBlockingMode */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket pSocket)
{
if (pSocket == nullptr) /* ENOTSOCK */
@@ -1544,9 +1361,6 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket pSocket)
return (pSocket->m_Flags & OSL_SOCKET_FLAGS_NONBLOCKING) != 0;
}
-/*****************************************************************************/
-/* osl_getSocketType */
-/*****************************************************************************/
oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket)
{
int Type=0;
@@ -1568,9 +1382,6 @@ oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket)
return TYPE_FROM_NATIVE(Type);
}
-/*****************************************************************************/
-/* osl_getLastSocketErrorDescription */
-/*****************************************************************************/
void SAL_CALL osl_getLastSocketErrorDescription (
oslSocket /*Socket*/,
rtl_uString **strError)
@@ -1792,26 +1603,17 @@ void SAL_CALL osl_getLastSocketErrorDescription (
}
}
-/*****************************************************************************/
-/* osl_getLastSocketError */
-/*****************************************************************************/
oslSocketError SAL_CALL osl_getLastSocketError(oslSocket /*Socket*/)
{
return ERROR_FROM_NATIVE(WSAGetLastError());
}
-/*****************************************************************************/
-/* SocketSet */
-/*****************************************************************************/
struct oslSocketSetImpl
{
fd_set m_Set; /* the set of descriptors */
};
-/*****************************************************************************/
-/* osl_createSocketSet */
-/*****************************************************************************/
oslSocketSet SAL_CALL osl_createSocketSet()
{
oslSocketSetImpl* pSet;
@@ -1826,27 +1628,18 @@ oslSocketSet SAL_CALL osl_createSocketSet()
return pSet;
}
-/*****************************************************************************/
-/* osl_destroySocketSet */
-/*****************************************************************************/
void SAL_CALL osl_destroySocketSet (oslSocketSet Set)
{
if(Set)
rtl_freeMemory(Set);
}
-/*****************************************************************************/
-/* osl_clearSocketSet */
-/*****************************************************************************/
void SAL_CALL osl_clearSocketSet (oslSocketSet Set)
{
if (Set)
FD_ZERO(&Set->m_Set);
}
-/*****************************************************************************/
-/* osl_addToSocketSet */
-/*****************************************************************************/
void SAL_CALL osl_addToSocketSet (
oslSocketSet Set,
oslSocket Socket)
@@ -1855,9 +1648,6 @@ void SAL_CALL osl_addToSocketSet (
FD_SET(Socket->m_Socket, &Set->m_Set);
}
-/*****************************************************************************/
-/* osl_removeFromSocketSet */
-/*****************************************************************************/
void SAL_CALL osl_removeFromSocketSet (
oslSocketSet Set,
oslSocket Socket)
@@ -1866,9 +1656,6 @@ void SAL_CALL osl_removeFromSocketSet (
FD_CLR(Socket->m_Socket, &Set->m_Set);
}
-/*****************************************************************************/
-/* osl_isInSocketSet */
-/*****************************************************************************/
sal_Bool SAL_CALL osl_isInSocketSet (
oslSocketSet Set,
oslSocket Socket)
@@ -1879,9 +1666,6 @@ sal_Bool SAL_CALL osl_isInSocketSet (
return false;
}
-/*****************************************************************************/
-/* osl_demultiplexSocketEvents */
-/*****************************************************************************/
sal_Int32 SAL_CALL osl_demultiplexSocketEvents (
oslSocketSet IncomingSet,
oslSocketSet OutgoingSet,
commit 4ddfa061bee94000dcb3e39ec396e63cf3289f0d
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 22 20:31:14 2017 +1000
osl: get rid of comment cruft in w32/security.cxx
Change-Id: Ifd3ba56ad420985e646162041682e4872a13258d
diff --git a/sal/osl/w32/security.cxx b/sal/osl/w32/security.cxx
index eba02216fa70..890a018a6515 100644
--- a/sal/osl/w32/security.cxx
+++ b/sal/osl/w32/security.cxx
@@ -27,10 +27,6 @@
#include <sal/macros.h>
#include "secimpl.hxx"
-/*****************************************************************************/
-/* Data Type Definition */
-/*****************************************************************************/
-
/* Data for use in (un)LoadProfile Functions */
/* Declarations based on USERENV.H for Windows 2000 Beta 2 */
#define PI_NOUI 0x00000001 // Prevents displaying of messages
@@ -69,18 +65,10 @@ typedef BOOL (STDMETHODCALLTYPE FAR * LPFNGETUSERPROFILEDIR) (
#define TOKEN_DUP_QUERY (TOKEN_QUERY|TOKEN_DUPLICATE)
-/*****************************************************************************/
-/* Static Module Function Declarations */
-/*****************************************************************************/
-
static bool GetSpecialFolder(rtl_uString **strPath,int nFolder);
static BOOL Privilege(LPTSTR pszPrivilege, BOOL bEnable);
static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain);
-/*****************************************************************************/
-/* Exported Module Functions */
-/*****************************************************************************/
-
oslSecurity SAL_CALL osl_getCurrentSecurity(void)
{
oslSecurityImpl* pSecImpl = static_cast<oslSecurityImpl *>(malloc(sizeof(oslSecurityImpl)));
@@ -129,7 +117,9 @@ oslSecurityError SAL_CALL osl_loginUser( rtl_uString *strUserName, rtl_uString *
ret = osl_Security_E_None;
}
else
+ {
ret = osl_Security_E_UserUnknown;
+ }
if (strDomain)
free(strDomain);
@@ -189,7 +179,9 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(rtl_uString *strUserName,
ret = osl_Security_E_None;
}
else
+ {
ret = osl_Security_E_UserUnknown;
+ }
free(remoteName);
free(userName);
@@ -207,7 +199,6 @@ static BOOL WINAPI CheckTokenMembership_Stub( HANDLE TokenHandle, PSID SidToChec
if ( !hModule )
{
/* SAL is always linked against ADVAPI32 so we can rely on that it is already mapped */
-
hModule = GetModuleHandleA( "ADVAPI32.DLL" );
pCheckTokenMembership = reinterpret_cast<CheckTokenMembership_PROC>(GetProcAddress( hModule, "CheckTokenMembership" ));
@@ -270,7 +261,9 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
return bSuccess;
}
else
+ {
return false;
+ }
}
void SAL_CALL osl_freeSecurityHandle(oslSecurity Security)
@@ -318,7 +311,9 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
pInfoBuffer, nInfoBuffer, &nInfoBuffer))
{
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+ {
pInfoBuffer = static_cast<UCHAR *>(realloc(pInfoBuffer, nInfoBuffer));
+ }
else
{
free(pInfoBuffer);
@@ -391,15 +386,14 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent)
}
else
{
- DWORD needed=0;
- sal_Unicode *Ident;
+ DWORD needed = 0;
+ sal_Unicode *Ident;
WNetGetUserA(nullptr, nullptr, &needed);
if (needed < 16)
- {
needed = 16;
- }
- Ident=static_cast<sal_Unicode *>(malloc(needed*sizeof(sal_Unicode)));
+
+ Ident = static_cast<sal_Unicode *>(malloc(needed*sizeof(sal_Unicode)));
if (WNetGetUserW(nullptr, SAL_W(Ident), &needed) != NO_ERROR)
{
@@ -458,7 +452,7 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDirectory)
{
- bool bSuccess = false;
+ bool bSuccess = false;
if (Security != nullptr)
{
@@ -547,13 +541,13 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security)
if (fLoadUserProfile && fUnloadUserProfile)
{
- rtl_uString *buffer = nullptr;
- PROFILEINFOW pi;
+ rtl_uString *buffer = nullptr;
+ PROFILEINFOW pi;
getUserNameImpl(Security, &buffer, false);
- ZeroMemory( &pi, sizeof(pi) );
- pi.dwSize = sizeof(pi);
+ ZeroMemory(&pi, sizeof(pi));
+ pi.dwSize = sizeof(pi);
pi.lpUserName = SAL_W(rtl_uString_getStr(buffer));
pi.dwFlags = PI_NOUI;
@@ -620,16 +614,10 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
static_cast<oslSecurityImpl*>(Security)->m_hProfile = nullptr;
if (hAccessToken && (hAccessToken != static_cast<oslSecurityImpl*>(Security)->m_hToken))
- {
CloseHandle(hAccessToken);
- }
}
}
-/*****************************************************************************/
-/* Static Module Functions */
-/*****************************************************************************/
-
static bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
{
bool bRet = false;
@@ -671,11 +659,11 @@ static bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
if (pSHGetSpecialFolderLocation && (pSHGetPathFromIDListA || pSHGetPathFromIDListW ) && pSHGetMalloc )
{
- LPITEMIDLIST pidl;
+ LPITEMIDLIST pidl;
LPMALLOC pMalloc;
- HRESULT hr;
+ HRESULT hr;
- hr = pSHGetSpecialFolderLocation(GetActiveWindow(), nFolder, &pidl);
+ hr = pSHGetSpecialFolderLocation(GetActiveWindow(), nFolder, &pidl);
/* Get SHGetSpecialFolderLocation fails if directory does not exists. */
/* If it fails we try to create the directory and redo the call */
@@ -720,14 +708,14 @@ static bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
if (SUCCEEDED(hr))
{
if (pSHGetPathFromIDListW && pSHGetPathFromIDListW(pidl, SAL_W(PathW)))
- {
+ {
/* if directory does not exist, create it */
if (_waccess(SAL_W(PathW), 0) < 0)
CreateDirectoryW(SAL_W(PathW), nullptr);
rtl_uString_newFromStr( strPath, PathW);
bRet = true;
- }
+ }
else if (pSHGetPathFromIDListA && pSHGetPathFromIDListA(pidl, PathA))
{
/* if directory does not exist, create it */
@@ -738,11 +726,11 @@ static bool GetSpecialFolder(rtl_uString **strPath, int nFolder)
OSL_ASSERT(*strPath != nullptr);
bRet = true;
}
- }
+ }
- if (SUCCEEDED(pSHGetMalloc(&pMalloc)))
+ if (SUCCEEDED(pSHGetMalloc(&pMalloc)))
{
- pMalloc->Free(pidl);
+ pMalloc->Free(pidl);
pMalloc->Release();
}
}
@@ -759,15 +747,11 @@ static BOOL Privilege(LPTSTR strPrivilege, BOOL bEnable)
HANDLE hToken;
TOKEN_PRIVILEGES tp;
- /*
- obtain the processes token
- */
+ // obtain the processes token
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_DUP_QUERY, &hToken))
return FALSE;
- /*
- get the luid
- */
+ // get the luid
if (!LookupPrivilegeValue(nullptr, strPrivilege, &tp.Privileges[0].Luid))
return FALSE;
@@ -778,9 +762,7 @@ static BOOL Privilege(LPTSTR strPrivilege, BOOL bEnable)
else
tp.Privileges[0].Attributes = 0;
- /*
- enable or disable the privilege
- */
+ // enable or disable the privilege
if (!AdjustTokenPrivileges(hToken, FALSE, &tp, 0, nullptr, nullptr))
return FALSE;
@@ -810,7 +792,9 @@ static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName
pInfoBuffer, nInfoBuffer, &nInfoBuffer))
{
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+ {
pInfoBuffer = static_cast<UCHAR *>(realloc(pInfoBuffer, nInfoBuffer));
+ }
else
{
free(pInfoBuffer);
@@ -845,7 +829,8 @@ static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName
{
wcscpy(SAL_W(Name), SAL_W(UserName));
}
- }
+ }
+
rtl_uString_newFromStr( strName, Name);
free(pInfoBuffer);
@@ -856,7 +841,7 @@ static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName
else
{
DWORD needed=0;
- sal_Unicode *pNameW=nullptr;
+ sal_Unicode *pNameW=nullptr;
WNetGetUserW(nullptr, nullptr, &needed);
pNameW = static_cast<sal_Unicode *>(malloc (needed*sizeof(sal_Unicode)));
commit 9df7952d237d77fb3acfab6ee2822e8391780af3
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 22 20:17:25 2017 +1000
osl: remove sig in comment
Change-Id: I7e02e463105cf65fcc47ce5e3d5f9476ff778cce
diff --git a/sal/osl/w32/secimpl.hxx b/sal/osl/w32/secimpl.hxx
index ff4121091ac1..b1f8746f912f 100644
--- a/sal/osl/w32/secimpl.hxx
+++ b/sal/osl/w32/secimpl.hxx
@@ -30,7 +30,7 @@ typedef struct {
HANDLE m_hProfile;
HANDLE m_hToken;
sal_Unicode m_User[USER_BUFFER_SIZE];
-/* ts: extension by fileserver login */
+/* extension by fileserver login */
NETRESOURCEW *m_pNetResource;
} oslSecurityImpl;
commit 2b2ad5ac217bf89f5bbde324678214219dc89d56
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 22 20:15:27 2017 +1000
osl: remove dead code from w32/salinit.cxx
Change-Id: I895c0bb5f9d2d072ab6aa7a6aabb22449287283a
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index 7b1b71fcbac3..c97afe0d843d 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -33,10 +33,6 @@ extern "C" {
void sal_detail_initialize(int argc, char ** argv)
{
sal_initGlobalTimer();
- // SetProcessDEPPolicy(PROCESS_DEP_ENABLE);
- // SetDllDirectoryW(L"");
- // SetSearchPathMode(
- // BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT);
HMODULE h = GetModuleHandleW(L"kernel32.dll");
if (h != nullptr) {
FARPROC p;
commit 4f2fc5115cff0d20b8e29a589d0d6c64e72d87ae
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 22 20:14:22 2017 +1000
osl: get rid of comment cruft in w32 profile.cxx
Change-Id: If85f1a6d436e894b27a2fcb10a8d44e56e193fff
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 97eb10f1eb07..36d28c2c58ed 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -69,10 +69,6 @@ static inline void copy_ustr_n( void *dest, const void *source, size_t length )
/*#define DEBUG_OSL_PROFILE 1*/
-/*****************************************************************************/
-/* Data Type Definition */
-/*****************************************************************************/
-
typedef FILETIME osl_TStamp;
enum osl_TLockMode
@@ -124,10 +120,6 @@ struct osl_TProfileImpl
osl_TProfileSection* m_Sections;
};
-/*****************************************************************************/
-/* Static Module Function Declarations */
-/*****************************************************************************/
-
static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption ProfileFlags );
static osl_TStamp closeFileImpl(osl_TFile* pFile);
static bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode);
@@ -163,10 +155,6 @@ static rtl_uString* osl_ProfileGenerateExtension(rtl_uString* ustrFileName, rtl_
static bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
-/*****************************************************************************/
-/* Exported Module Functions */
-/*****************************************************************************/
-
oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flags)
{
osl_TFile* pFile = nullptr;
@@ -595,11 +583,9 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
pProfile = acquireProfile(Profile, true);
if (pProfile == nullptr)
- {
return false;
- }
- if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
+ if (!(pProfile->m_Flags & osl_Profile_SYSTEM))
{
osl_TProfileSection* pSec;
if (((pSec = findEntry(pProfile, pszSection, pszEntry, &NoEntry)) != nullptr) &&
@@ -636,16 +622,14 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_Char *pszSection,
sal_Char* pszBuffer, sal_uInt32 MaxLen)
{
- sal_uInt32 i, n = 0;
- sal_uInt32 NoEntry;
- osl_TProfileImpl* pProfile = nullptr;
+ sal_uInt32 i, n = 0;
+ sal_uInt32 NoEntry;
+ osl_TProfileImpl* pProfile = nullptr;
pProfile = acquireProfile(Profile, false);
if (pProfile == nullptr)
- {
return 0;
- }
if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
{
@@ -664,7 +648,9 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
pszBuffer[n++] = '\0';
}
else
+ {
break;
+ }
}
@@ -673,13 +659,17 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
else
{
for (i = 0; i < pSec->m_NoEntries; i++)
+ {
n += pSec->m_Entries[i].m_Len + 1;
+ }
n += 1;
}
}
else
+ {
n = 0;
+ }
}
else
{
@@ -959,10 +949,6 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff
return n;
}
-/*****************************************************************************/
-/* Static Module Functions */
-/*****************************************************************************/
-
static osl_TStamp getFileStamp(osl_TFile* pFile)
{
FILETIME FileTime;
@@ -1025,8 +1011,8 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi
FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
- /* mfe: argghh!!! do not check if the file could be openend */
- /* default mode expects it that way!!! */
+ /* mfe: argghh!!! do not check if the file could be opened */
+ /* default mode expects it that way!!! */
}
else
{
@@ -1725,15 +1711,11 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
ustrTmpName=osl_ProfileGenerateExtension(pProfile->m_strFileName,ustrExtension);
rtl_uString_release(ustrExtension);
- if ( ustrTmpName == nullptr )
- {
+ if (ustrTmpName == nullptr)
return nullptr;
- }
- if ( ! ( pProfile->m_Flags & osl_Profile_READLOCK ) )
- {
+ if (!(pProfile->m_Flags & osl_Profile_READLOCK))
PFlags |= osl_Profile_WRITELOCK;
- }
/* open this file */
pFile = openFileImpl(ustrTmpName,pProfile->m_Flags | PFlags);
More information about the Libreoffice-commits
mailing list