[Libreoffice-commits] core.git: include/osl include/sal sw/qa

[Mike Kaganski (via logerrit)]

 include/osl/interlck.h|4 ++--
 include/sal/mathconf.h|2 +-
 sw/qa/extras/odfexport/odfexport2.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 76e11899e1439b298883721907b49bd1813f5d0c
Author: Mike Kaganski 
AuthorDate: Fri Aug 25 10:05:52 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Aug 25 11:12:31 2023 +0200

WNT -> _WIN32

Change-Id: I09b1744c568b39c5b4160154536730962feb3a8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156089
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index 6264c595d0b2..f0a39e52c74e 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -70,7 +70,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInte
 */
 #if HAVE_GCC_BUILTIN_ATOMIC
 #define osl_atomic_increment(p)  __sync_add_and_fetch((p), 1)
-#elif defined WNT
+#elif defined _WIN32
 #define osl_atomic_increment(p)  _InterlockedIncrement(p)
 #else
 #define osl_atomic_increment(p) osl_incrementInterlockedCount((p))
@@ -89,7 +89,7 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInte
 */
 #if HAVE_GCC_BUILTIN_ATOMIC
 #define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1)
-#elif defined WNT
+#elif defined _WIN32
 #define osl_atomic_decrement(p)  _InterlockedDecrement(p)
 #else
 #define osl_atomic_decrement(p) osl_decrementInterlockedCount((p))
diff --git a/include/sal/mathconf.h b/include/sal/mathconf.h
index 3f8e98937d3c..ac824f1e486b 100644
--- a/include/sal/mathconf.h
+++ b/include/sal/mathconf.h
@@ -72,7 +72,7 @@ extern "C" {
 #define SAL_MATH_FINITE(d) std::isfinite(d)
 #elif defined __APPLE__ && !(defined __i386__ || defined __x86_64__)
 #define SAL_MATH_FINITE(d) isfinite(d)
-#elif defined( WNT)
+#elif defined(_WIN32)
 #define SAL_MATH_FINITE(d) _finite(d)
 #elif defined(ANDROID) || defined LINUX || defined UNX
 #define SAL_MATH_FINITE(d) finite(d)
diff --git a/sw/qa/extras/odfexport/odfexport2.cxx 
b/sw/qa/extras/odfexport/odfexport2.cxx
index 7d9d1a26169d..1c9d442e073b 100644
--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
@@ -999,7 +999,7 @@ DECLARE_ODFEXPORT_TEST(testTdf78510, "WordTest_edit.odt")
 // wonder how fragile this is...
 // FIXME some platform difference, 1st one is 2306 on Linux, 3087 on WNT ?
 // some Mac has 3110
-#if !defined(WNT) && !defined(MACOSX)
+#if !defined(_WIN32) && !defined(MACOSX)
 {
 SwDocShell *const 
pShell(dynamic_cast(*mxComponent).GetDocShell());
 std::shared_ptr pMetaFile = pShell->GetPreviewMetaFile();

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann (via logerrit)]

 include/osl/time.h |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5e192fab19e1f51a704a0c690af5343d43b8e724
Author: Stephan Bergmann 
AuthorDate: Tue Sep 13 17:17:10 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 13 19:22:20 2022 +0200

Turn this into a doxygen comment

Change-Id: Icd310f663bcb83947c3ad40e3243bd8e37b4872e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139869
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/time.h b/include/osl/time.h
index a906a15bfe8a..f2f5b7a4f8ed 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -39,9 +39,10 @@
 #   pragma pack(push, 8)
 #endif
 
-/* Time since Jan-01-1970
+/** Time since Jan-01-1970
 
-   TODO: sal_uInt32 TimeValue::Seconds is only large enough for representing 
dates until year 2106.
+@warning sal_uInt32 TimeValue::Seconds is only large enough for 
representing dates until year
+2106.
 */
 
 #if defined LIBO_INTERNAL_ONLY && defined __cplusplus

[Libreoffice-commits] core.git: include/osl sal/osl ucb/source

[Stephan Bergmann (via logerrit)]

 include/osl/time.h |5 -
 sal/osl/unx/time.cxx   |2 ++
 ucb/source/ucp/gio/gio_content.cxx |2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 2c8ced01216096dd03a4143fe41b4c5653deb67a
Author: Stephan Bergmann 
AuthorDate: Tue Sep 13 13:11:12 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 13 17:14:26 2022 +0200

cid#1509290, cid#1509240: Silence "Use of 32-bit time_t (Y2K38_SAFETY)" for 
now

We'll eventually need to do something about the 32 bit TimeValue::Seconds, 
but
as it is unsigned we should be fine for another 80 years (until "06:28:15 
UTC on
Sunday, 7 February 2106", according to
).

Change-Id: I74e680be0b2f0ef8cd84d6bc0faef436efc8d3cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139859
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/time.h b/include/osl/time.h
index 5c5096cada8a..a906a15bfe8a 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -39,7 +39,10 @@
 #   pragma pack(push, 8)
 #endif
 
-/* Time since Jan-01-1970 */
+/* Time since Jan-01-1970
+
+   TODO: sal_uInt32 TimeValue::Seconds is only large enough for representing 
dates until year 2106.
+*/
 
 #if defined LIBO_INTERNAL_ONLY && defined __cplusplus
 
diff --git a/sal/osl/unx/time.cxx b/sal/osl/unx/time.cxx
index a77015614e74..d6a2ca33ba6c 100644
--- a/sal/osl/unx/time.cxx
+++ b/sal/osl/unx/time.cxx
@@ -170,6 +170,8 @@ sal_Bool SAL_CALL osl_getTimeValueFromDateTime( const 
oslDateTime* pDateTime, Ti
 bias = aTime.tm_isdst > 0 ? timezone - 3600 : timezone;
 #endif
 
+// coverity[store_truncates_time_t] - TODO: sal_uInt32 
TimeValue::Seconds is only large
+// enough for integer time_t values < 2^32 representing dates until 
year 2106:
 pTimeVal->Seconds = nSeconds;
 pTimeVal->Nanosec = pDateTime->NanoSeconds;
 
diff --git a/ucb/source/ucp/gio/gio_content.cxx 
b/ucb/source/ucp/gio/gio_content.cxx
index fc31965a990f..5c225a951dbd 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -422,6 +422,8 @@ static css::util::DateTime getDateFromUnix (time_t t)
 {
 TimeValue tv;
 tv.Nanosec = 0;
+// coverity[store_truncates_time_t] - TODO: sal_uInt32 TimeValue::Seconds 
is only large enough
+// for integer time_t values < 2^32 representing dates until year 2106:
 tv.Seconds = t;
 oslDateTime dt;
 

[Libreoffice-commits] core.git: include/osl include/rtl

[Chris Sherlock (via logerrit)]

 include/osl/mutex.hxx   |4 +++-
 include/osl/profile.hxx |3 ++-
 include/osl/security.h  |1 -
 include/osl/socket.h|3 ++-
 include/osl/socket_decl.hxx |4 +++-
 include/rtl/alloc.h |   20 +---
 include/rtl/cipher.h|4 +++-
 include/rtl/digest.h|1 -
 include/rtl/random.h|1 -
 include/rtl/ustring.h   |1 -
 10 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 18dacc47b212bec440a5f729a2787aa91db89b44
Author: Chris Sherlock 
AuthorDate: Sun Jul 3 01:28:18 2022 +1000
Commit: Stephan Bergmann 
CommitDate: Tue Jul 5 12:36:32 2022 +0200

sal: fix invalid doxygen

Change-Id: Ib26a695c88d02a0ce5a3c9974fae9f88d8ae89ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136783
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 96bfd3e02178..481a2bb55002 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -36,7 +36,9 @@ namespace osl
 
 public:
 /** Create a mutex.
-@return 0 if the mutex could not be created, otherwise a handle to 
the mutex.
+
+The mutex value is 0 if it could not be created, otherwise a 
handle to the mutex.
+
 @see ::osl_createMutex()
 */
 Mutex()
diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index ec75e3ce3470..e83fef0c665c 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -48,7 +48,8 @@ namespace osl {
 
 public:
 /** Open or create a configuration profile.
-@retval 0 if the profile could not be created, otherwise a handle 
to the profile.
+
+Sets a handle to the profile, otherwise if the profile could not 
be opened then throw an exception.
 */
 Profile(const rtl::OUString & strProfileName, oslProfileOption Options 
= Profile_DEFAULT )
 {
diff --git a/include/osl/security.h b/include/osl/security.h
index 56674027ea19..9c56f20971f4 100644
--- a/include/osl/security.h
+++ b/include/osl/security.h
@@ -162,7 +162,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_loadUserProfile(
 /** Unload a User Profile
 Implemented just for Windows
 @param[in] Security previously fetch Security of the User
-@return nothing is returned!
 */
 
 SAL_DLLPUBLIC void SAL_CALL osl_unloadUserProfile(
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 7f87da312d4e..474860b14701 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -832,7 +832,8 @@ SAL_DLLPUBLIC void SAL_CALL osl_destroyHostAddr(oslHostAddr 
Addr);
 
 
 /** Get the hostname member of Addr.
-@return The hostname or 0 upon failure.
+@param Addr address for host name
+@param strHostname The host name or 0 upon failure.
 */
 SAL_DLLPUBLIC void SAL_CALL osl_getHostnameOfHostAddr(const oslHostAddr Addr, 
rtl_uString **strHostname);
 
diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index de6442b273b2..1ff2bababa29 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -174,8 +174,10 @@ namespace osl
 static inline ::rtl::OUString SAL_CALL getLocalHostname( 
oslSocketResult *pResult = NULL);
 
 /** Tries to find an address for a host.
+
 @see osl_resolveHostname()
-@return A new created socket-address or 0 if the name could not be 
found.
+@param strHostName hostname
+@param Addr A newly created socket-address or 0 if the name could 
not be found.
 */
 static inline void SAL_CALL resolveHostname(
 const ::rtl::OUString & strHostName , SocketAddr & Addr );
diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index 79a94704c222..4ce01cf1bcb4 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -68,8 +68,10 @@ SAL_DLLPUBLIC void * SAL_CALL rtl_reallocateMemory (
 
 
 /** Free memory.
+
+Memory is released, and the pointer is invalidated.
+
 @param[in] Ptr pointer to the previously allocated memory.
-@return none. Memory is released. Ptr is invalid.
  */
 SAL_DLLPUBLIC void SAL_CALL rtl_freeMemory (
 void * Ptr
@@ -103,10 +105,12 @@ SAL_DLLPUBLIC void SAL_CALL rtl_secureZeroMemory (
 
 
 /** Zero and free memory.
+
+Memory is zero'ed with rtl_secureZeroMemory() and released.
+The original pointer is no longer valid.
+
 @param[in] Ptr   pointer to the previously allocated memory.
 @param[in] Bytes memory size.
-@return none. Memory is zero'ed with rtl_secureZeroMemory() and released.
-  Ptr is invalid.
  */
 SAL_DLLPUBLIC void SAL_CALL rtl_freeZeroMemory (
 void *   Ptr,
@@ -136,8 +140,9 @@ SAL_DLLPUBLIC void* SAL_CALL rtl_allocateAlignedMemory (
 
 /** Free memory allocated with rtl_allocateAlignedMemory().
 
+Memory is released, and the pointer invalidated.
+
 @param[in] Ptr pointer to the previously allocated memory.
-

[Libreoffice-commits] core.git: include/osl

[Jan-Marek Glogowski (via logerrit)]

 include/osl/module.h |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 148536afc9838398100ca2267b99ab349dcbb38c
Author: Jan-Marek Glogowski 
AuthorDate: Tue Jan 18 14:05:00 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Jan 18 19:23:36 2022 +0100

Drop config_global.h from osl/module.h

Quoting sberg: "an include file like this one that is part of
the published URE interface must not include an include file
like config_host/config_global.h that is not part of the
published URE interface."

I did grep for other config files in include, but that missed
the "ifdef LIBO_INTERNAL_ONLY" protection; most time this file
will be included via some other header, so just drop it.

Change-Id: I18b0792de3f8351efd00557a66d4ef8979ca6550
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128555
Reviewed-by: Stephan Bergmann 
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jenkins

diff --git a/include/osl/module.h b/include/osl/module.h
index e3140f4a67f8..9d80d352afaa 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -25,8 +25,6 @@
 #define INCLUDED_OSL_MODULE_H
 
 #include "sal/config.h"
-// convenience include for HAVE_DLAPI define
-#include "config_global.h"
 
 #include "rtl/ustring.h"
 #include "sal/saldllapi.h"

[Libreoffice-commits] core.git: include/osl sal/osl

[Stephan Bergmann (via logerrit)]

 include/osl/socket.h   |   80 --
 sal/osl/all/compat.cxx |   30 +++
 sal/osl/unx/socket.cxx |  129 -
 sal/osl/w32/socket.cxx |   80 --
 4 files changed, 30 insertions(+), 289 deletions(-)

New commits:
commit db392a8a255326b7a094daeabd7fba195db6a9a5
Author: Stephan Bergmann 
AuthorDate: Tue Jul 27 15:00:46 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jul 27 19:26:24 2021 +0200

[API CHANGE] Drop obsolete osl_demultiplexSocketEvents et al

...which were deprecated in 0a126b4c661d65860fd2de92f8cc49bdb65a957c 
"Deprecate
osl_demultiplexSocketEvents et al" towards LO 7.2 (and leave aborting stubs 
in
place for backwards compatibility)

Change-Id: Ice6032eb2f351af87dd56eecb002aa2a91e79373
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119560
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 8e2a0066d17e..7f87da312d4e 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -610,86 +610,6 @@ SAL_DLLPUBLIC void SAL_CALL 
osl_getLastSocketErrorDescription(
 SAL_DLLPUBLIC oslSocketError SAL_CALL osl_getLastSocketError(
 oslSocket Socket);
 
-/** Type for the representation of socket sets.
-
-@deprecated
-*/
-typedef struct oslSocketSetImpl * oslSocketSet;
-
-/** Creates a set of sockets to be used with osl_demultiplexSocketEvents().
-
-@return A oslSocketSet or 0 if creation failed.
-
-@deprecated
-*/
-SAL_DLLPUBLIC oslSocketSet SAL_CALL osl_createSocketSet(void);
-
-/** Destroys an oslSocketSet.
-
-@deprecated
-*/
-SAL_DLLPUBLIC void SAL_CALL osl_destroySocketSet(oslSocketSet Set);
-
-/** Clears the set from all previously added sockets.
-
-@param Set the set to be cleared.
-
-@deprecated
-*/
-SAL_DLLPUBLIC void SAL_CALL osl_clearSocketSet(oslSocketSet Set);
-
-
-/** Adds a socket to the set.
-
-@param Set the set were the socket is added.
-@param Socket the socket to be added.
-
-@deprecated
-*/
-SAL_DLLPUBLIC void SAL_CALL osl_addToSocketSet(oslSocketSet Set, oslSocket 
Socket);
-
-/** Removes a socket from the set.
-
-@param Set the set were the socket is removed from.
-@param Socket the socket to be removed.
-
-@deprecated
-*/
-SAL_DLLPUBLIC void SAL_CALL osl_removeFromSocketSet(oslSocketSet Set, 
oslSocket Socket);
-
-/** Checks if socket is in the set.
-
-@param Set the set to be checked.
-@param Socket check if this socket is in the set.
-
-@retval sal_True if socket is in the set.
-
-@deprecated
-*/
-SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isInSocketSet(oslSocketSet Set, oslSocket 
Socket);
-
-/** Checks multiple sockets for events.
-
-@param IncomingSet Checks the sockets in this set for incoming events 
(read, accept). If the set is 0,
-it is just skipped.
-@param OutgoingSet Checks the sockets in this set for outgoing events 
(write, connect). If the set is 0,
-it is just skipped.
-@param OutOfBandSet Checks the sockets in this set for out-of-band events. 
If the set is 0, it is just
-skipped.
-@param pTimeout Address of the number of milliseconds to wait for events. 
If *pTimeout is -1, the call
-will block until an event or an error occurs.
-
-@return -1 on errors, otherwise the number of sockets with pending events. 
In case of timeout, the
-number might be 0.
-
-@deprecated
-*/
-SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_demultiplexSocketEvents(
-oslSocketSet IncomingSet,
-oslSocketSet OutgoingSet,
-oslSocketSet OutOfBandSet,
-const TimeValue* pTimeout);
-
 /** Closes the socket terminating any ongoing dataflow.
 
 @param[in] Socket The socket to close.
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index 406c39229397..8fafc628b57e 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -25,6 +25,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL 
osl_acquireSemaphore(void *) {
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+SAL_DLLPUBLIC void SAL_CALL osl_addToSocketSet(void *, oslSocket) {
+std::abort();
+}
+
 SAL_DLLPUBLIC_EXPORT int SAL_CALL osl_areCommandArgsSet() {
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
@@ -39,18 +43,40 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_breakDebug() {
 std::abort();
 }
 
+SAL_DLLPUBLIC void SAL_CALL osl_clearSocketSet(void *) {
+std::abort();
+}
+
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL osl_createSemaphore(sal_uInt32) {
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+SAL_DLLPUBLIC void * SAL_CALL osl_createSocketSet() {
+for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC sal_Int32 SAL_CALL 

[Libreoffice-commits] core.git: include/osl sal/osl sal/qa

[Mike Kaganski (via logerrit)]

 include/osl/thread.h|4 ++--
 sal/osl/w32/thread.cxx  |4 
 sal/qa/osl/setthreadname/test-setthreadname.cxx |3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit f1be88688cf1ca4ab14f93ae1a75e0331a6577cb
Author: Mike Kaganski 
AuthorDate: Wed Jun 2 14:57:20 2021 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jun 2 15:26:28 2021 +0200

Revert "sb138: #i115619# fix for MinGW"

This reverts commit 6727dc5d9414e77975b9fd765993c6e207f872f3.
We now don't support compiling using MinGW.

Change-Id: I0dee00780bfb4b7deceddd8cd30af03b7f7ed212
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116591
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/osl/thread.h b/include/osl/thread.h
index d04fc0ef41fc..03d7cbd9d587 100644
--- a/include/osl/thread.h
+++ b/include/osl/thread.h
@@ -191,8 +191,8 @@ SAL_DLLPUBLIC void SAL_CALL osl_yieldThread(void);
 
 The name of a thread is usually evaluated for debugging purposes.  Not all
 platforms support this.  On Linux, a set thread name can be observed with
-"ps -L".  On Windows with the Microsoft compiler, a thread name set while a
-debugger is attached can be observed within the debugger.
+"ps -L".  On Windows a thread name set while a debugger is attached can be
+observed within the debugger.
 
 @param name  the name of the thread; must not be null; on Linux, only the
 first 16 characters are used
diff --git a/sal/osl/w32/thread.cxx b/sal/osl/w32/thread.cxx
index c10950e9151f..d4a9d6d67060 100644
--- a/sal/osl/w32/thread.cxx
+++ b/sal/osl/w32/thread.cxx
@@ -359,7 +359,6 @@ void SAL_CALL osl_yieldThread(void)
 }
 
 void SAL_CALL osl_setThreadName(char const * name) {
-#ifdef _MSC_VER
 /* See : */
 #pragma pack(push, 8)
 struct {
@@ -378,9 +377,6 @@ void SAL_CALL osl_setThreadName(char const * name) {
 0x406D1388, 0, sizeof info / sizeof (ULONG_PTR),
 reinterpret_cast());
 } __except (EXCEPTION_EXECUTE_HANDLER) {}
-#else
-(void) name;
-#endif
 }
 
 namespace {
diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx 
b/sal/qa/osl/setthreadname/test-setthreadname.cxx
index c0c884eea7ab..9af8793eb1c2 100644
--- a/sal/qa/osl/setthreadname/test-setthreadname.cxx
+++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx
@@ -51,8 +51,7 @@ void TestThread::run() {
 setName("TestThread");
 if (std::getenv("URE_TEST_SETTHREADNAME") != nullptr) {
 // On Linux, the thread name can now be observed with "ps -L"; on
-// Windows with the Microsoft compiler, the thread name can now be
-// observed in a debugger.
+// Windows, the thread name can now be observed in a debugger.
 std::cout << "stop: ";
 std::cin.ignore(std::numeric_limits< int >::max(), '\n');
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann (via logerrit)]

 include/osl/socket.h |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 0a126b4c661d65860fd2de92f8cc49bdb65a957c
Author: Stephan Bergmann 
AuthorDate: Tue May 25 09:58:33 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 25 12:54:04 2021 +0200

Deprecate osl_demultiplexSocketEvents et al

The oslSocketSet/osl_*SocketSet/osl_demultiplexSocketEvents functionality is
based on the POSIX fd_set/FD_*/select functionality, which suffers from the
issue that it has undefined behavior for file descriptors with numerical 
values
greater than or equal to FD_SETSIZE.  (And this can be a real issue e.g. on
Linux, where tools::extendApplicationEnvironment in
tools/source/misc/extendapplicationenvironment.cxx bumps the soft 
RLIMIT_NOFILE
to the hard limit---so that file descriptors can likely have large 
values---,
but where the GNU C library sets FD_SETSIZE to only 1024 and ignores larger
descriptors.)

This functionality is unused at least by LO itself, and also likely unused 
by
third-party code.  So instead of fixing the Unix-based implementation in
sal/osl/unx/socket.cxx (by e.g. switching it from select to poll), just 
mark the
functionality as deprecated (with the option of eventually removing the
functionality completely from sal/osl/{unx,w32}/socket.cxx, leaving just 
stubs
in sal/osl/all/compat.cxx).

Change-Id: I2b97f8a37b45f298da9328660006f3c14361c9a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116089
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 0492dd3179ab..8e2a0066d17e 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -611,22 +611,30 @@ SAL_DLLPUBLIC oslSocketError SAL_CALL 
osl_getLastSocketError(
 oslSocket Socket);
 
 /** Type for the representation of socket sets.
+
+@deprecated
 */
 typedef struct oslSocketSetImpl * oslSocketSet;
 
 /** Creates a set of sockets to be used with osl_demultiplexSocketEvents().
 
 @return A oslSocketSet or 0 if creation failed.
+
+@deprecated
 */
 SAL_DLLPUBLIC oslSocketSet SAL_CALL osl_createSocketSet(void);
 
 /** Destroys an oslSocketSet.
+
+@deprecated
 */
 SAL_DLLPUBLIC void SAL_CALL osl_destroySocketSet(oslSocketSet Set);
 
 /** Clears the set from all previously added sockets.
 
 @param Set the set to be cleared.
+
+@deprecated
 */
 SAL_DLLPUBLIC void SAL_CALL osl_clearSocketSet(oslSocketSet Set);
 
@@ -635,6 +643,8 @@ SAL_DLLPUBLIC void SAL_CALL osl_clearSocketSet(oslSocketSet 
Set);
 
 @param Set the set were the socket is added.
 @param Socket the socket to be added.
+
+@deprecated
 */
 SAL_DLLPUBLIC void SAL_CALL osl_addToSocketSet(oslSocketSet Set, oslSocket 
Socket);
 
@@ -642,6 +652,8 @@ SAL_DLLPUBLIC void SAL_CALL osl_addToSocketSet(oslSocketSet 
Set, oslSocket Socke
 
 @param Set the set were the socket is removed from.
 @param Socket the socket to be removed.
+
+@deprecated
 */
 SAL_DLLPUBLIC void SAL_CALL osl_removeFromSocketSet(oslSocketSet Set, 
oslSocket Socket);
 
@@ -651,6 +663,8 @@ SAL_DLLPUBLIC void SAL_CALL 
osl_removeFromSocketSet(oslSocketSet Set, oslSocket
 @param Socket check if this socket is in the set.
 
 @retval sal_True if socket is in the set.
+
+@deprecated
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isInSocketSet(oslSocketSet Set, oslSocket 
Socket);
 
@@ -667,6 +681,8 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL 
osl_isInSocketSet(oslSocketSet Set, oslSocket So
 
 @return -1 on errors, otherwise the number of sockets with pending events. 
In case of timeout, the
 number might be 0.
+
+@deprecated
 */
 SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_demultiplexSocketEvents(
 oslSocketSet IncomingSet,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/inc sal/osl

[Samuel Mehrbrodt (via logerrit)]

 include/osl/socket.h |3 +--
 sal/inc/oslsocket.hxx|   24 
 sal/osl/unx/file_url.cxx |7 +--
 sal/osl/unx/socket.cxx   |   20 +---
 4 files changed, 47 insertions(+), 7 deletions(-)

New commits:
commit eac00017e34e77343b9ac3638bed9c75115a23fe
Author: Samuel Mehrbrodt 
AuthorDate: Thu Dec 10 14:24:05 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Apr 19 09:22:57 2021 +0200

[API CHANGE] Do not call getaddrinfo if we just want the hostname

Similiar to afc41a467fdfabb2cd0879be3e4f1879a1d1dc91 ,
don't call getaddrinfo in getLocalHostname which calls DNS.

This causes a lag when creating the lockfile on opening a document
if the network is flaky/disabled.
See tdf#97931 and tdf#47179 for some problems caused by this.

For the one case where it is expected to call DNS, add a separate function
to restore the old behavior.

The (semantic) [API CHANGE] is in osl_getLocalHostname,
it does no longer return a FQDN.

Change-Id: I43455715a474ff6770351d1ce007c28aeb08f32e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107554
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 864e8df88d84..0492dd3179ab 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -906,8 +906,7 @@ SAL_DLLPUBLIC void SAL_CALL osl_getHostnameOfHostAddr(const 
oslHostAddr Addr, rt
 */
 SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_getSocketAddrOfHostAddr(const 
oslHostAddr Addr);
 
-/** Retrieve this machines hostname.
-May not always be a fully qualified domain name (FQDN).
+/** Retrieve this machines hostname (NOT the FQDN)
 @param  strLocalHostname out-parameter. The string that receives the local 
host name.
 @retval sal_True upon success
 @retval sal_False
diff --git a/sal/inc/oslsocket.hxx b/sal/inc/oslsocket.hxx
new file mode 100644
index ..52260c263190
--- /dev/null
+++ b/sal/inc/oslsocket.hxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+#include 
+
+/** Retrieve this machines hostname as fully qualified domain name (FQDN).
+Note that this might be slower than calling osl_getLocalHostname
+since DNS needs to be queried to determine the FQDN.
+@param  strLocalHostname out-parameter. The string that receives the local 
host name.
+@retval sal_True upon success
+@retval sal_False
+*/
+oslSocketResult osl_getLocalHostnameFQDN(rtl_uString** strLocalHostname);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
\ No newline at end of file
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 54ec0c02ac46..ba5ccc766e6c 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -246,7 +247,7 @@ template oslFileError getSystemPathFromFileUrl(
 if (url.indexOf('?', i) != -1 || url.indexOf('#', i) != -1)
 return osl_File_E_INVAL;
 // Handle authority, supporting a host of "localhost", "127.0.0.1", or the 
exact value (e.g.,
-// not supporting an additional final dot, for simplicity) reported by 
osl_getLocalHostname
+// not supporting an additional final dot, for simplicity) reported by 
osl_getLocalHostnameFQDN
 // (and, in each case, ignoring case of ASCII letters):
 if (url.getLength() - i >= 2 && url[i] == '/' && url[i + 1] == '/')
 {
@@ -265,7 +266,9 @@ template oslFileError getSystemPathFromFileUrl(
 != 0))
 {
 OUString hostname;
-if (osl_getLocalHostname() != osl_Socket_Ok
+// The 'file' URI Scheme does imply that we want a FQDN in this 
case
+// See https://tools.ietf.org/html/rfc8089#section-3
+if (osl_getLocalHostnameFQDN() != osl_Socket_Ok
 || (rtl_ustr_compareIgnoreAsciiCase_WithLength(
 url.pData->buffer + i, j - i, hostname.getStr(), 
hostname.getLength())
 != 0))
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 56a8f6cd63ac..0c93e2928500 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -36,6 +36,7 @@
 
 #include "sockimpl.hxx"
 #include "unixerrnostring.hxx"
+#include 
 
 /* defines for poll */
 #ifdef HAVE_POLL_H
@@ -865,9 +866,11 @@ void SAL_CALL osl_destroyHostAddr (oslHostAddr pAddr)
 }
 }
 
-oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString **ustrLocalHostname)
+namespace
+{
+oslSocketResult 

[Libreoffice-commits] core.git: include/osl sal/Library_sal.mk sal/osl

[Mike Kaganski (via logerrit)]

 include/osl/mutex.hxx   |3 +++
 sal/Library_sal.mk  |1 +
 sal/osl/all/mutexshared.cxx |   20 
 sal/osl/unx/mutex.cxx   |   26 --
 sal/osl/w32/dllentry.cxx|6 --
 sal/osl/w32/gmutex.hxx  |   31 ---
 sal/osl/w32/mutex.cxx   |6 --
 7 files changed, 24 insertions(+), 69 deletions(-)

New commits:
commit c42f60e2b9a521005e1263e781c878e2598b44df
Author: Mike Kaganski 
AuthorDate: Fri Jan 29 09:57:41 2021 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jan 30 10:10:41 2021 +0100

Simplify osl_getGlobalMutex to use function-local static

Change-Id: I36df8be817d0f0cb75efa00b0b523f379f67d1d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110126
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index f984f035ca40..84955b681143 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -89,6 +89,9 @@ namespace osl
 private:
 oslMutex mutex;
 
+// access to the oslMutex
+friend oslMutex* SAL_CALL ::osl_getGlobalMutex();
+
 /** The underlying oslMutex has no reference count.
 
 Since the underlying oslMutex is not a reference counted object, copy
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index ddbd13a37392..fbc02f26d6da 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/all/filepath \
sal/osl/all/loadmodulerelative \
sal/osl/all/log  \
+   sal/osl/all/mutexshared \
sal/osl/all/signalshared  \
sal/osl/all/utility \
sal/rtl/alloc_arena \
diff --git a/sal/osl/all/mutexshared.cxx b/sal/osl/all/mutexshared.cxx
new file mode 100644
index ..3de7f99303a8
--- /dev/null
+++ b/sal/osl/all/mutexshared.cxx
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+
+oslMutex* SAL_CALL osl_getGlobalMutex()
+{
+static osl::Mutex g_Mutex;
+return _Mutex.mutex;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx
index 8cdc2a071376..1ca4958fd01d 100644
--- a/sal/osl/unx/mutex.cxx
+++ b/sal/osl/unx/mutex.cxx
@@ -160,30 +160,4 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutex pMutex)
 return false;
 }
 
-static oslMutexImpl globalMutexImpl;
-
-static void globalMutexInitImpl() {
-pthread_mutexattr_t attr;
-if (pthread_mutexattr_init() != 0 ||
-pthread_mutexattr_settype(, PTHREAD_MUTEX_RECURSIVE) ||
-pthread_mutex_init(, ) != 0 ||
-pthread_mutexattr_destroy() != 0)
-{
-abort();
-}
-}
-
-oslMutex * SAL_CALL osl_getGlobalMutex()
-{
-/* necessary to get a "oslMutex *" */
-static oslMutex globalMutex = 
-
-static pthread_once_t once = PTHREAD_ONCE_INIT;
-if (pthread_once(, ) != 0) {
-abort();
-}
-
-return 
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/dllentry.cxx b/sal/osl/w32/dllentry.cxx
index 3dba6d0e0c9f..a36e6cda8840 100644
--- a/sal/osl/w32/dllentry.cxx
+++ b/sal/osl/w32/dllentry.cxx
@@ -32,7 +32,6 @@
 #include 
 
 #include "file_url.hxx"
-#include "gmutex.hxx"
 #include 
 
 #include "thread.hxx"
@@ -85,9 +84,6 @@ static BOOL WINAPI RawDllMain( HINSTANCE, DWORD fdwReason, 
LPVOID )
 SetErrorMode( SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS 
);
 #endif
 
-/* initialize global mutex */
-g_Mutex = osl_createMutex();
-
 g_dwTLSTextEncodingIndex = TlsAlloc();
 
 //We disable floating point exceptions. This is the usual 
state at program startup
@@ -101,8 +97,6 @@ static BOOL WINAPI RawDllMain( HINSTANCE, DWORD fdwReason, 
LPVOID )
 
 TlsFree( g_dwTLSTextEncodingIndex );
 
-osl_destroyMutex( g_Mutex );
-
 /*
 
 On a product build memory management finalization might
diff --git a/sal/osl/w32/gmutex.hxx b/sal/osl/w32/gmutex.hxx
deleted file mode 100644
index 013b4c178262..
--- a/sal/osl/w32/gmutex.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file 

[Libreoffice-commits] core.git: include/osl tools/source

[Jan-Marek Glogowski (via logerrit)]

 include/osl/endian.h|2 +-
 tools/source/misc/cpuid.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8babcdb9c995b6c0e20a16e237f5e9cadd1f83ce
Author: Jan-Marek Glogowski 
AuthorDate: Fri Jul 17 22:26:12 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu Sep 17 06:38:23 2020 +0200

osl+tools: fix Windows Arm64 build

Change-Id: I17cbc1c8474880024921f476aa602d61978da868
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102851
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/include/osl/endian.h b/include/osl/endian.h
index 43d0162b55df..766178a7eefc 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -31,7 +31,7 @@ extern "C" {
 
 #if defined _WIN32
 #   if defined _M_ALPHA || defined _M_AMD64 || defined _M_IX86 \
-|| defined _M_MRX000 || defined _M_PPC
+|| defined _M_MRX000 || defined _M_PPC || defined _M_ARM64
 #   define OSL_LITENDIAN
 #   endif
 #elif defined ANDROID || defined LINUX || defined HAIKU
diff --git a/tools/source/misc/cpuid.cxx b/tools/source/misc/cpuid.cxx
index 41791be27897..e2a8e20a762a 100644
--- a/tools/source/misc/cpuid.cxx
+++ b/tools/source/misc/cpuid.cxx
@@ -15,7 +15,7 @@ namespace cpuid {
 
 namespace {
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64))
 #include 
 void getCpuId(uint32_t array[4], uint32_t nInfoType)
 {
@@ -38,7 +38,7 @@ void getCpuId(uint32_t array[4], uint32_t /*nInfoType*/)
 bool checkAVXSupportInOS()
 {
 uint32_t xcr0 = 0;
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64))
 xcr0 = uint32_t(_xgetbv(0));
 #elif (defined(__i386__) || defined(__x86_64__))
 __asm__("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Julien Nabet (via logerrit)]

 include/osl/socket.h |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0ffbfe0d621b75aec43190e0837461c2961bf4d5
Author: Julien Nabet 
AuthorDate: Sat Sep 5 23:04:10 2020 +0200
Commit: Julien Nabet 
CommitDate: Sun Sep 6 12:21:01 2020 +0200

Fix warn "unbalanced grouping commands" in socket.h

Change-Id: I290d96f8c2bcc9688e1d7acba95564b6bc97b64b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102097
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 2357e8c53c01..846e3fab36b2 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -31,6 +31,9 @@ extern "C" {
 #define OSL_INADDR_NONE 0x
 #define OSL_INVALID_PORT (-1)
 
+/**@{ begin section types
+*/
+
 /**
 Opaque datatype SocketAddr.
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl sal/rtl

[Noel Grandin (via logerrit)]

 include/osl/profile.hxx |   14 --
 include/osl/socket.hxx  |3 ++-
 sal/osl/unx/profile.cxx |   14 --
 sal/rtl/math.cxx|   16 +++-
 sal/rtl/strtmpl.cxx |8 +---
 sal/rtl/ustring.cxx |   16 ++--
 6 files changed, 48 insertions(+), 23 deletions(-)

New commits:
commit 72d8f2961fd7f5670fe2564eeb3aa14a6eaf0d8d
Author: Noel Grandin 
AuthorDate: Wed Apr 15 09:13:58 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 15 11:24:09 2020 +0200

loplugin:buriedassign in sal

Change-Id: I5a7bc9378ceacb9116c03e3a9fc01c5675c40908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92243
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index b62ea0628ca7..0ce69a8aea3b 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -160,8 +160,13 @@ namespace osl {
 sal_Char* pBuf = new sal_Char[ n+1 ];
 osl_getProfileSectionEntries( profile, rSection.getStr(), 
pBuf, n+1 );
 size_t nLen;
-for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
+for( n = 0; ; n += nLen+1 )
+{
+nLen = strlen( pBuf+n );
+if (!nLen)
+break;
 aEntries.push_back( rtl::OString( pBuf+n ) );
+}
 delete[] pBuf;
 }
 
@@ -182,8 +187,13 @@ namespace osl {
 sal_Char* pBuf = new sal_Char[ n+1 ];
 osl_getProfileSections( profile, pBuf, n+1 );
 size_t nLen;
-for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
+for( n = 0; ; n += nLen+1 )
+{
+nLen = strlen( pBuf+n );
+if (!nLen)
+break;
 aSections.push_back( rtl::OString( pBuf+n ) );
+}
 delete[] pBuf;
 }
 
diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index 640880144177..2ea81fcfd3e0 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -242,7 +242,8 @@ namespace osl
 
 inline Socket&  Socket::operator= (const Socket& sock)
 {
-return (*this) = sock.getHandle();
+*this = sock.getHandle();
+return *this;
 }
 
 
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index edb76019ff5d..ce3742bc8a10 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -391,8 +391,8 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
 
 if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
 {
-osl_TProfileSection* pSec;
-if (((pSec = findEntry(pProfile, pszSection, pszEntry, )) != 
nullptr) &&
+osl_TProfileSection* pSec = findEntry(pProfile, pszSection, pszEntry, 
);
+if ((pSec != nullptr) &&
 (NoEntry < pSec->m_NoEntries) &&
 ((pStr = strchr(pProfile->m_Lines[pSec->m_Entries[NoEntry].m_Line],
 '=')) != nullptr))
@@ -535,7 +535,8 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
 Line[1 + strlen(pszSection)] = ']';
 Line[2 + strlen(pszSection)] = '\0';
 
-if (((pStr = addLine(pProfile, Line)) == nullptr) ||
+pStr = addLine(pProfile, Line);
+if ((pStr == nullptr) ||
 (! addSection(pProfile, pProfile->m_NoLines - 1, [1], 
strlen(pszSection
 {
 bRet=releaseProfile(pProfile);
@@ -563,7 +564,8 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
 else
 i = pSec->m_Line + 1;
 
-if (((pStr = insertLine(pProfile, Line, i)) == nullptr) ||
+pStr = insertLine(pProfile, Line, i);
+if ((pStr == nullptr) ||
 (! addEntry(pProfile, pSec, i, pStr, strlen(pszEntry
 {
 bRet=releaseProfile(pProfile);
@@ -675,8 +677,8 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
 
 if (! (pProfile->m_Flags & osl_Profile_SYSTEM))
 {
-osl_TProfileSection* pSec;
-if (((pSec = findEntry(pProfile, pszSection, pszEntry, )) != 
nullptr) &&
+osl_TProfileSection* pSec = findEntry(pProfile, pszSection, pszEntry, 
);
+if ((pSec != nullptr) &&
 (NoEntry < pSec->m_NoEntries))
 {
 removeLine(pProfile, pSec->m_Entries[NoEntry].m_Line);
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 135035e01138..099cd3d60578 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -172,9 +172,10 @@ bool isRepresentableInteger(double fAbsValue)
 // XXX loplugin:fpcomparison complains about floating-point comparison
 // for static_cast(nInt) == fAbsValue, though we actually want
 // this here.
-double fInt;
-return (nInt 

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/file.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2846686272931cd8bb0bcd452dd0e8b5b52064b1
Author: Andrea Gelmini 
AuthorDate: Mon Mar 23 17:09:20 2020 +0100
Commit: Julien Nabet 
CommitDate: Tue Mar 24 09:25:14 2020 +0100

Fix typo

Change-Id: I5a430d2e681b0c95476b4b59ca5281da6a05ee8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90924
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index f5fdb2ee1f53..8a677e505408 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -206,7 +206,7 @@ public:
 return static_cast< RC >( osl_getFileURLFromSystemPath( 
ustrSystemPath.pData,  ) );
 }
 
-/** Searche a full qualified system path or a file URL.
+/** Search a full qualified system path or a file URL.
 
 @param[in] ustrFileName
 A system dependent path, a file URL, a file or relative directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/profile.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b2c0593236a934ad95192120674c962cf11e002
Author: Andrea Gelmini 
AuthorDate: Wed Feb 5 10:33:38 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Feb 5 11:22:47 2020 +0100

Fix typo

Change-Id: Ia64904100110472464e9025b1e53ef65bd2416c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88001
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index e369dce9ee1f..b62ea0628ca7 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -32,7 +32,7 @@ namespace osl {
 typedef oslProfileOption ProfileOption;
 
 const int Profile_DEFAULT   = osl_Profile_DEFAULT;
-const int Profile_SYSTEM= osl_Profile_SYSTEM;/* use system 
depended functinality */
+const int Profile_SYSTEM= osl_Profile_SYSTEM;/* use system 
depended functionality */
 const int Profile_READLOCK  = osl_Profile_READLOCK;  /* lock file for 
reading*/
 const int Profile_WRITELOCK = osl_Profile_WRITELOCK; /* lock file for 
writing*/
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/profile.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27dab8928cba95718103ecc39bb26f75e9b5c725
Author: Andrea Gelmini 
AuthorDate: Wed Feb 5 10:33:36 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Feb 5 11:22:16 2020 +0100

Fix typo

Change-Id: I1a241b6d84d4129f94cf19ba764b3a40ec2a7887
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88000
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/osl/profile.h b/include/osl/profile.h
index dd5c3dfbe6bf..fc553d545228 100644
--- a/include/osl/profile.h
+++ b/include/osl/profile.h
@@ -33,7 +33,7 @@ extern "C" {
 typedef sal_uInt32 oslProfileOption;
 
 #define osl_Profile_DEFAULT 0x
-#define osl_Profile_SYSTEM  0x0001/* use system depended functinality 
*/
+#define osl_Profile_SYSTEM  0x0001/* use system depended functionality 
*/
 #define osl_Profile_READLOCK0x0002/* lock file for reading
*/
 #define osl_Profile_WRITELOCK   0x0004/* lock file for writing
*/
 #define osl_Profile_FLUSHWRITE  0x0010/* writing only with flush  
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Julien Nabet (via logerrit)]

 include/osl/file.h   |1 -
 include/osl/file.hxx |2 --
 2 files changed, 3 deletions(-)

New commits:
commit 77d301f5e40e4f0fb4a127b8b6361a0fb1b1dbd9
Author: Julien Nabet 
AuthorDate: Tue Nov 19 20:11:39 2019 +0100
Commit: Julien Nabet 
CommitDate: Tue Nov 19 21:09:50 2019 +0100

Fix multiple documentation sections (osl)

Fix these warnings:
Line 45: /cygdrive/c/BLP/core/instdir/sdk/include/osl/file.h:1308: warning: 
return value 'osl_File_E_LOOP' of osl_removeFile has multiple documentation 
sections
Line 49: /cygdrive/c/BLP/core/instdir/sdk/include/osl/file.hxx:1893: 
warning: return value 'E_BUSY' of osl::Directory::remove has multiple 
documentation sections
Line 50: /cygdrive/c/BLP/core/instdir/sdk/include/osl/file.hxx:1361: 
warning: return value 'E_LOOP' of osl::File::remove has multiple documentation 
sections

Change-Id: Id82280efd9c6d1e33df966159dbef677839f6083
Reviewed-on: https://gerrit.libreoffice.org/83229
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/file.h b/include/osl/file.h
index c9b917c6e204..c57a1226dc69 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1298,7 +1298,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_createDirectoryPath(
 @retval osl_File_E_IO on I/O errors
 @retval osl_File_E_BUSY device or resource busy
 @retval osl_File_E_INTR function call was interrupted
-@retval osl_File_E_LOOP too many symbolic links encountered
 @retval osl_File_E_MULTIHOP multihop attempted
 @retval osl_File_E_NOLINK link has been severed
 @retval osl_File_E_TXTBSY text file busy
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 824cb7a3e904..f5fdb2ee1f53 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -1350,7 +1350,6 @@ public:
 @retval E_IO on I/O errors
 @retval E_BUSY device or resource busy
 @retval E_INTR function call was interrupted
-@retval E_LOOP too many symbolic links encountered
 @retval E_MULTIHOP multihop attempted
 @retval E_NOLINK link has been severed
 @retval E_TXTBSY text file busy
@@ -1881,7 +1880,6 @@ public:
 @retval E_BUSY device or resource busy
 @retval E_ROFS read-only file system
 @retval E_LOOP too many symbolic links encountered
-@retval E_BUSY device or resource busy
 @retval E_EXIST file exists
 @retval E_IO on I/O errors
 @retval E_MULTIHOP multihop attempted
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann (via logerrit)]

 include/osl/file.h   |2 +-
 include/osl/file.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d4ad516bc0607a1d84451dd3dc8811a4f801fa4c
Author: Stephan Bergmann 
AuthorDate: Thu Oct 10 14:24:38 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 10 15:25:05 2019 +0200

Adapt osl_replaceFile documentation

...to eedf523c123a82bf3cbc5f389783e22d75b2e2c5 "tdf#127069 sal: preserve 
gid of
files in the unx osl_replaceFile()"

Change-Id: I47627418a9cd662802e4de3aa4cad4128af82ad4
Reviewed-on: https://gerrit.libreoffice.org/80606
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/file.h b/include/osl/file.h
index 309d6089cfb3..c9b917c6e204 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1639,7 +1639,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_createTempFile(
 Moves or renames a file, replacing an existing file if exist. If the old 
file existed,
 moved file's metadata, e.g. creation time (on FSes which keep files' 
creation time) or
 ACLs, are set to old one's (to keep the old file's identity) - currently 
this is only
-implemented on Windows; on other platforms, this is equivalent to 
osl_moveFile.
+implemented fully on Windows; on other platforms, this is mostly 
equivalent to osl_moveFile.
 
 @param[in] pustrSourceFileURL
 Full qualified URL of the source file.
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 528e24e7a11e..824cb7a3e904 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -1303,7 +1303,7 @@ public:
 Moves or renames a file, replacing an existing file if exist. If the 
old file existed,
 moved file's metadata, e.g. creation time (on FSes which keep files' 
creation time) or
 ACLs, are set to old one's (to keep the old file's identity) - 
currently this is only
-implemented on Windows; on other platforms, this is equivalent to 
osl_moveFile.
+implemented fully on Windows; on other platforms, this is mostly 
equivalent to osl_moveFile.
 
 @param[in] ustrSourceFileURL
 Full qualified URL of the source file.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/time.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d8ba42941a5a37ff42c4b4f277287b1e6a4d739
Author: Andrea Gelmini 
AuthorDate: Sun Jul 14 17:42:29 2019 +
Commit: Julien Nabet 
CommitDate: Sun Jul 14 22:52:38 2019 +0200

Fix typo

Change-Id: If136ac948234ec77d67058fc47922dc2154b1831
Reviewed-on: https://gerrit.libreoffice.org/75593
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/time.h b/include/osl/time.h
index 5dd8d9d8f342..93cb28fca868 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -167,7 +167,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL 
osl_getSystemTimeFromLocalTime(
 
 
 /** Get the value of the global timer
-@return current timer value in milli seconds
+@return current timer value in milliseconds
  */
 
 SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getGlobalTimer(void);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/file.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c72177966aa64df049a841ade0a8156a47a607b1
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:23 2019 +
Commit: Julien Nabet 
CommitDate: Sun Jul 14 22:51:51 2019 +0200

Fix typo

Change-Id: I151f472d5c542b989e858da22b29140c8e1b9b5b
Reviewed-on: https://gerrit.libreoffice.org/75584
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index b11f76731867..528e24e7a11e 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -1625,7 +1625,7 @@ extern "C" inline void SAL_CALL onDirectoryCreated(void* 
pData, rtl_uString* aDi
 
static_cast(pData)->DirectoryCreated(aDirectoryUrl);
 }
 
-/** The directory class object provides a enumeration of DirectoryItems.
+/** The directory class object provides an enumeration of DirectoryItems.
 
 @see DirectoryItem
 @see File
@@ -1681,7 +1681,7 @@ public:
 @retval E_None on success
 @retval E_INVAL the format of the parameters was not valid
 @retval E_NOENT the specified path doesn't exist
-@retval E_NOTDIR the specified path is not an directory
+@retval E_NOTDIR the specified path is not a directory
 @retval E_NOMEM not enough memory for allocating structures
 @retval E_ACCES permission denied
 @retval E_MFILE too many open files used by the process
@@ -1740,7 +1740,7 @@ public:
 @retval E_None on success
 @retval E_INVAL the format of the parameters was not valid
 @retval E_NOENT the specified path doesn't exist
-@retval E_NOTDIR the specified path is not an directory
+@retval E_NOTDIR the specified path is not a directory
 @retval E_NOMEM not enough memory for allocating structures
 @retval E_ACCES permission denied
 @retval E_MFILE too many open files used by the process
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/socket.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 093f7b4a5a611abaac7fa507d34ed4856d329899
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:17 2019 +
Commit: Julien Nabet 
CommitDate: Sun Jul 14 22:49:49 2019 +0200

Fix typo

Change-Id: Icbd1d5f76611734e66481f18ec0239d159fea5d6
Reviewed-on: https://gerrit.libreoffice.org/75592
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/osl/socket.h b/include/osl/socket.h
index a7eda5e9c69f..2357e8c53c01 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -47,7 +47,7 @@ typedef enum {
 } oslAddrFamily;
 
 /**
-represent a specific protocol within a address-family
+represent a specific protocol within an address-family
 */
 typedef enum {
 osl_Socket_ProtocolIp,  /*!< for all af_inet   
 */
@@ -834,7 +834,7 @@ SAL_DLLPUBLIC oslSocketResult SAL_CALL 
osl_setAddrOfSocketAddr(
 /** Returns the addr field in the struct sockaddr.
 @param[in] Addr The socket address from which to extract the ipaddress.
 @param[out] ppByteSeq After the call, *ppByteSeq contains the ipaddress
- in network byteorder. *ppByteSeq may be 0 in case of an 
invalid socket handle.
+ in network byte order. *ppByteSeq may be 0 in case of an 
invalid socket handle.
 @retval osl_Socket_Ok
 @retval osl_Socket_Error
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/profile.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9896425ff4db1f368ee5dbaa88d23cbd05f3edce
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:18 2019 +
Commit: Julien Nabet 
CommitDate: Sun Jul 14 22:32:15 2019 +0200

Fix typo

Change-Id: I035d86014891462adababc8de5ccb06fa6cd
Reviewed-on: https://gerrit.libreoffice.org/75591
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index 48b6b8c861f4..e369dce9ee1f 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -147,7 +147,7 @@ namespace osl {
 
 /** Get all entries belonging to the specified section.
 @param rSection Name of the section.
-@return Pointer to a array of pointers.
+@return Pointer to an array of pointers.
 */
 std::list< rtl::OString > getSectionEntries(const rtl::OString& 
rSection )
 {
@@ -169,7 +169,7 @@ namespace osl {
 }
 
 /** Get all section entries
-@return Pointer to a array of pointers.
+@return Pointer to an array of pointers.
 */
 std::list< rtl::OString > getSections()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/profile.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 03c7930af7994d0d98af5653167990f82dc0d706
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:19 2019 +
Commit: Julien Nabet 
CommitDate: Sun Jul 14 22:30:39 2019 +0200

Fix typo

Change-Id: I8fa5e8afe6de453f20c241e9b03f06841f63ed5d
Reviewed-on: https://gerrit.libreoffice.org/75590
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/profile.h b/include/osl/profile.h
index 3eb87583272f..dd5c3dfbe6bf 100644
--- a/include/osl/profile.h
+++ b/include/osl/profile.h
@@ -51,7 +51,7 @@ SAL_DLLPUBLIC oslProfile SAL_CALL osl_openProfile(
 
 /** Deprecated API.
 Close the opened profile an flush all data to the disk.
-@param Profile handle to a opened profile.
+@param Profile handle to an opened profile.
 @deprecated
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_closeProfile(
@@ -123,7 +123,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_removeProfileEntry(
 
 /** Deprecated API.
 Get all entries belonging to the specified section.
-@returns Pointer to a array of pointers.
+@returns Pointer to an array of pointers.
 @deprecated
 */
 SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSectionEntries(
@@ -132,7 +132,7 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL 
osl_getProfileSectionEntries(
 
 /** Deprecated API.
 Get all section entries
-@retval Pointer to a array of pointers.
+@retval Pointer to an array of pointers.
 @deprecated
 */
 SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getProfileSections(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/file.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a6afd69364f43f5971140e7fc4289c7cd3eb02bc
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:24 2019 +
Commit: Julien Nabet 
CommitDate: Sun Jul 14 19:16:19 2019 +0200

Fix typo

Change-Id: I39efb064f94354ad3b8881f875311f0422fe6925
Reviewed-on: https://gerrit.libreoffice.org/75583
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/osl/file.h b/include/osl/file.h
index 9548ed8d7571..ebba23af47c4 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -74,7 +74,7 @@ for a "FileExists". This should only be done when processing 
a single file
 (i.e. before opening) and NEVER during enumeration of directory contents on
 any step of information processing. This would change the runtime behaviour
 from O(n) to O(n*n/2) on nearly every file system.  On Windows NT reading the
-contents of an directory with 7000 entries and getting full information about
+contents of a directory with 7000 entries and getting full information about
 every file only takes 0.6 seconds. Specifying the flag
 osl_FileStatus_Mask_Validate for each entry will increase the time to 180
 seconds (!!!).
@@ -151,7 +151,7 @@ typedef void *oslDirectoryItem;
 @retval osl_File_E_None on success
 @retval osl_File_E_INVAL the format of the parameters was not valid
 @retval osl_File_E_NOENT the specified path doesn't exist
-@retval osl_File_E_NOTDIR the specified path is not an directory
+@retval osl_File_E_NOTDIR the specified path is not a directory
 @retval osl_File_E_NOMEM not enough memory for allocating structures
 @retval osl_File_E_ACCES permission denied
 @retval osl_File_E_MFILE too many open files used by the process
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Jan-Marek Glogowski (via logerrit)]

 include/osl/mutex.hxx |   19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

New commits:
commit ad7302b5a62bbf382fb7e900cedfa317a4bf57d8
Author: Jan-Marek Glogowski 
AuthorDate: Wed Apr 10 17:38:10 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Apr 11 23:53:48 2019 +0200

[API CHANGE] Restore old exteral API behaviour

Commit d38f9934f08939032cca64a32de58fa3901a88d5 ("[API CHANGE]
Asserts to never clear already cleared guard") changes the API
in a way, which can silently break compiling code for no reason.

As discussed on the mailing list, this uses LIBO_INTERNAL_ONLY to
restores the old behaviour for external API users.

Change-Id: I43c9b955c1c8f5402588fcea2bfc38ab6fa9f263
Reviewed-on: https://gerrit.libreoffice.org/70528
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 9a9f76f67efa..f984f035ca40 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -185,9 +185,15 @@ namespace osl
 */
 void clear()
 {
+#ifdef LIBO_INTERNAL_ONLY
 assert(pT);
-pT->release();
-pT = NULL;
+#else
+if (pT)
+#endif
+{
+pT->release();
+pT = NULL;
+}
 }
 };
 
@@ -226,9 +232,14 @@ namespace osl
 */
 void reset()
 {
+#ifdef LIBO_INTERNAL_ONLY
 assert(!this->pT);
-this->pT = pResetT;
-this->pT->acquire();
+#endif
+if (pResetT)
+{
+this->pT = pResetT;
+this->pT->acquire();
+}
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini (via logerrit)]

 include/osl/mutex.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7619ce98904885f2806ceedbaf849b772376926b
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 19:34:52 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed Apr 10 22:04:31 2019 +0200

Fix typo

Change-Id: I2df9e24ff0d4683819db8fa17bd6a0dfda223e13
Reviewed-on: https://gerrit.libreoffice.org/70534
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 0297232065b0..9a9f76f67efa 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -105,7 +105,7 @@ namespace osl
 
 /** Object lifetime scoped mutex object or interface lock.
  *
- * Aquires the template object on construction and releases it on
+ * Acquires the template object on construction and releases it on
  * destruction.
  *
  * @see MutexGuard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Jan-Marek Glogowski (via logerrit)]

 include/osl/mutex.hxx |   46 +-
 1 file changed, 29 insertions(+), 17 deletions(-)

New commits:
commit cf09ec89a45c4e3435db4ca18f531a2333cc49df
Author: Jan-Marek Glogowski 
AuthorDate: Tue Apr 9 16:56:21 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Apr 10 17:49:18 2019 +0200

Unify deleted function templates and improve docs

... and doesn't change any code or API.

Change-Id: Ic769831130bb78b8192ffd33375760bef9b76911
Reviewed-on: https://gerrit.libreoffice.org/70466
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index ea7cdf50d19e..0297232065b0 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -103,19 +103,23 @@ namespace osl
 Mutex& operator= (const Mutex&) SAL_DELETED_FUNCTION;
 };
 
-/** A helper class for mutex objects and interfaces.
-*/
+/** Object lifetime scoped mutex object or interface lock.
+ *
+ * Aquires the template object on construction and releases it on
+ * destruction.
+ *
+ * @see MutexGuard
+ */
 template
 class Guard
 {
-private:
-Guard( const Guard& ) SAL_DELETED_FUNCTION;
-const Guard& operator = ( const Guard& ) SAL_DELETED_FUNCTION;
+Guard(const Guard&) SAL_DELETED_FUNCTION;
+Guard& operator=(const Guard&) SAL_DELETED_FUNCTION;
 
 protected:
 T * pT;
-public:
 
+public:
 /** Acquires the object specified as parameter.
 */
 Guard(T * pT_) : pT(pT_)
@@ -138,19 +142,22 @@ namespace osl
 }
 };
 
-/** A helper class for mutex objects and interfaces.
-*/
+/** Object lifetime scoped mutex object or interface lock with unlock.
+ *
+ * Use this if you can't use scoped code blocks and Guard.
+ *
+ * @see ClearableMutexGuard, Guard
+ */
 template
 class ClearableGuard
 {
-private:
 ClearableGuard( const ClearableGuard& ) SAL_DELETED_FUNCTION;
-const ClearableGuard& operator = ( const ClearableGuard& )
-SAL_DELETED_FUNCTION;
+ClearableGuard& operator=(const ClearableGuard&) SAL_DELETED_FUNCTION;
+
 protected:
 T * pT;
-public:
 
+public:
 /** Acquires the object specified as parameter.
 */
 ClearableGuard(T * pT_) : pT(pT_)
@@ -184,17 +191,22 @@ namespace osl
 }
 };
 
-/** A helper class for mutex objects and interfaces.
-*/
+/** Template for temporary releasable mutex objects and interfaces locks.
+ *
+ * Use this if you want to acquire a lock but need to temporary release
+ * it and can't use multiple scoped Guard objects.
+ *
+ * @see ResettableMutexGuard
+ */
 template< class T >
 class ResettableGuard : public ClearableGuard< T >
 {
-private:
-ResettableGuard(ResettableGuard &) SAL_DELETED_FUNCTION;
-void operator =(ResettableGuard &) SAL_DELETED_FUNCTION;
+ResettableGuard(const ResettableGuard&) SAL_DELETED_FUNCTION;
+ResettableGuard& operator=(const ResettableGuard&) 
SAL_DELETED_FUNCTION;
 
 protected:
 T* pResetT;
+
 public:
 /** Acquires the object specified as parameter.
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Jan-Marek Glogowski (via logerrit)]

 include/osl/mutex.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c1e320836b7dbcd9fe6ded8352355ea6101bd821
Author: Jan-Marek Glogowski 
AuthorDate: Tue Apr 9 16:53:52 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue Apr 9 19:15:05 2019 +0200

Add asserts to *Guard pointer constructors...

... as we can't drop them. IMHO it's still better then just a
crash. Has to use NULL, as the API is pre-C++11 compatible.

Change-Id: Idb4395d14a9185f4d7d1c2f048ad950518eef133
Reviewed-on: https://gerrit.libreoffice.org/70465
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index c2ee448d868e..5bcf0e56cce0 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -22,6 +22,7 @@
 
 #include "osl/mutex.h"
 
+#include 
 
 namespace osl
 {
@@ -119,6 +120,7 @@ namespace osl
 */
 Guard(T * pT_) : pT(pT_)
 {
+assert(pT != NULL);
 pT->acquire();
 }
 
@@ -153,6 +155,7 @@ namespace osl
 */
 ClearableGuard(T * pT_) : pT(pT_)
 {
+assert(pT != NULL);
 pT->acquire();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/android

[Libreoffice Gerrit user]

 include/osl/detail/android-bootstrap.h |4 
 sal/android/lo-bootstrap.c |7 +++
 2 files changed, 11 insertions(+)

New commits:
commit f43483ce36b8a50ecc9266f26bc7b4ac302c6661
Author: Jan Holesovsky 
AuthorDate: Mon Feb 18 13:25:40 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Mar 11 17:44:10 2019 +0100

android: Expose setting of the JavaVM.

Needed when we use the liblo-native-code as a library.

Change-Id: Ia4d1d72f2203a96d1196d015b521201919bbb165
Reviewed-on: https://gerrit.libreoffice.org/67965
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/include/osl/detail/android-bootstrap.h 
b/include/osl/detail/android-bootstrap.h
index 5a5c7fcbd82d..169f3efaf282 100644
--- a/include/osl/detail/android-bootstrap.h
+++ b/include/osl/detail/android-bootstrap.h
@@ -35,6 +35,10 @@ int lo_apk_closedir(lo_apk_dir *dirp);
 
 int lo_apk_lstat(const char *path, struct stat *statp);
 
+/// "libreofficekit_" prefix, because it is exported from the .so, when we are
+/// initializing the JNI externally.
+void libreofficekit_set_javavm(JavaVM *vm);
+
 JavaVM *lo_get_javavm(void);
 
 const char *lo_get_app_data_dir(void);
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index d1ecd810ab19..0af8cfbb4cd3 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -898,6 +898,13 @@ 
Java_org_libreoffice_android_Bootstrap_address_1of_1direct_1byte_1buffer(JNIEnv
 }
 
 __attribute__ ((visibility("default")))
+void
+libreofficekit_set_javavm(JavaVM *vm)
+{
+the_java_vm = vm;
+}
+
+__attribute__ ((visibility("default")))
 JavaVM *
 lo_get_javavm(void)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl sal/util sfx2/source

[Libreoffice Gerrit user]

 include/osl/file.h  |   31 +++
 include/osl/file.hxx|   33 +
 sal/osl/unx/file_misc.cxx   |5 +
 sal/osl/w32/file.cxx|   34 ++
 sal/util/sal.map|5 +
 sfx2/source/doc/docfile.cxx |3 ++-
 6 files changed, 110 insertions(+), 1 deletion(-)

New commits:
commit c9343988204ee3e9889f3cc833adbbaca83e53e6
Author: Mike Kaganski 
AuthorDate: Fri Sep 7 17:11:48 2018 +0300
Commit: Mike Kaganski 
CommitDate: Thu Sep 27 16:43:48 2018 +0200

tdf#119238: keep replaced file's identity when renaming docfile

Regression from 2157a3536f97ff5ae7c82611a801fef7e3708983

  sfx2 store: try rename before copying

  Rename is cheaper then copying the content over manually, so try that
  first.

On Windows, we need to keep the file's dentity, including metadata (e.g.,
creation time, which is kept in FS). WinAPI has ReplaceFileW specifically
for this, and it keeps ACLs of the original file, and otherwise makes the
changed file not a separate entry, but updated old file from system's PoV.

Eventually, we could try to restructure creating backup copies (e.g., for
documents when configured so) to take advantage of this function being able
to do that.

Change-Id: I6001a2a3af5e10bc010f5ef129f4bb6f83ee1581
Reviewed-on: https://gerrit.libreoffice.org/60163
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/include/osl/file.h b/include/osl/file.h
index 133b93de0c93..cf0bbfb9495d 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1634,6 +1634,37 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_createTempFile(
 oslFileHandle* pHandle,
 rtl_uString**  ppustrTempFileURL);
 
+/** Move a file to a new destination or rename it, taking old file's identity 
(if exists).
+
+Moves or renames a file, replacing an existing file if exist. If the old 
file existed,
+moved file's metadata, e.g. creation time (on FSes which keep files' 
creation time) or
+ACLs, are set to old one's (to keep the old file's identity) - currently 
this is only
+implemented on Windows; on other platforms, this is equivalent to 
osl_moveFile.
+
+@param[in] pustrSourceFileURL
+Full qualified URL of the source file.
+
+@param[in] pustrDestFileURL
+Full qualified URL of the destination file.
+
+@retval osl_File_E_None on success
+@retval osl_File_E_INVAL the format of the parameters was not valid
+@retval osl_File_E_NOMEM not enough memory for allocating structures
+@retval osl_File_E_ACCES permission denied
+@retval osl_File_E_PERM operation not permitted
+@retval osl_File_E_NAMETOOLONG file name too long
+@retval osl_File_E_NOENT no such file
+@retval osl_File_E_ROFS read-only file system
+@retval osl_File_E_BUSY if the implementation internally requires 
resources that are
+(temporarily) unavailable
+
+@see osl_moveFile()
+
+@since LibreOffice 6.2
+*/
+SAL_DLLPUBLIC oslFileError SAL_CALL osl_replaceFile(rtl_uString* 
pustrSourceFileURL,
+rtl_uString* 
pustrDestFileURL);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index a154aa4f27bc..855398db4038 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -1298,6 +1298,39 @@ public:
 return static_cast< RC >( osl_moveFile( ustrSourceFileURL.pData, 
ustrDestFileURL.pData ) );
 }
 
+/** Move a file to a new destination or rename it, taking old file's 
identity (if exists).
+
+Moves or renames a file, replacing an existing file if exist. If the 
old file existed,
+moved file's metadata, e.g. creation time (on FSes which keep files' 
creation time) or
+ACLs, are set to old one's (to keep the old file's identity) - 
currently this is only
+implemented on Windows; on other platforms, this is equivalent to 
osl_moveFile.
+
+@param[in] ustrSourceFileURL
+Full qualified URL of the source file.
+
+@param[in] ustrDestFileURL
+Full qualified URL of the destination file.
+
+@retval E_None on success
+@retval E_INVAL the format of the parameters was not valid
+@retval E_NOMEM not enough memory for allocating structures
+@retval E_ACCES permission denied
+@retval E_PERM operation not permitted
+@retval E_NAMETOOLONG file name too long
+@retval E_NOENT no such file
+@retval E_ROFS read-only file system
+@retval E_BUSY device or resource busy
+
+@see move()
+
+@since LibreOffice 6.2
+*/
+static RC replace(const ::rtl::OUString& ustrSourceFileURL,
+  const ::rtl::OUString& ustrDestFileURL)
+{
+return static_cast(osl_replaceFile(ustrSourceFileURL.pData, 
ustrDestFileURL.pData));
+}
+
 /** 

[Libreoffice-commits] core.git: include/osl

[Libreoffice Gerrit user]

 include/osl/pipe.hxx|5 -
 include/osl/pipe_decl.hxx   |5 -
 include/osl/socket.hxx  |5 -
 include/osl/socket_decl.hxx |2 --
 4 files changed, 17 deletions(-)

New commits:
commit 739f746254853dbf6552b0fac9192bfd5ddd0118
Author: Stephan Bergmann 
AuthorDate: Thu Jul 26 14:00:34 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 08:26:07 2018 +0200

sal: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future

Change-Id: I4da623b67ef1792f9dd04382dcb0e772d66bdb40
Reviewed-on: https://gerrit.libreoffice.org/58104
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/pipe.hxx b/include/osl/pipe.hxx
index 40362de287a7..e9cfe2e6c3f0 100644
--- a/include/osl/pipe.hxx
+++ b/include/osl/pipe.hxx
@@ -186,11 +186,6 @@ namespace osl
 : Pipe( strName, Options )
 {}
 
-
-inline StreamPipe::StreamPipe(const StreamPipe& aPipe)
-: Pipe( aPipe )
-{}
-
 inline StreamPipe::StreamPipe( oslPipe pipe, __sal_NoAcquire noacquire )
 : Pipe( pipe , noacquire )
 {}
diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx
index 81bc4fd81183..146b77a5624e 100644
--- a/include/osl/pipe_decl.hxx
+++ b/include/osl/pipe_decl.hxx
@@ -160,11 +160,6 @@ public:
 */
 inline StreamPipe(oslPipe Pipe);
 
-/** Copy constructor.
-@param Pipe
-*/
-inline StreamPipe(const StreamPipe& Pipe);
-
 /** Creates a pipe.
 
 @param[in] strName Pipe name
diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index 78bb4b1c3768..0227095df089 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -433,11 +433,6 @@ namespace osl
 {}
 
 
-inline StreamSocket::StreamSocket( const StreamSocket & socket )
-: Socket( socket )
-{}
-
-
 inline sal_Int32 StreamSocket::read(void* pBuffer, sal_uInt32 n)
 {
 return osl_readSocket( m_handle, pBuffer, n );
diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index ebf831dfb0e4..3d2a05634348 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -538,8 +538,6 @@ namespace osl
 oslProtocol Protocol = osl_Socket_ProtocolIp,
 oslSocketType   Type = osl_Socket_TypeStream);
 
-inline StreamSocket( const StreamSocket & );
-
 inline StreamSocket( oslSocket Socket , __sal_NoAcquire noacquire );
 
 inline StreamSocket( oslSocket Socket );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Aron Budea]

 include/osl/file.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2219f0f6f85316d05231130c89613b98e7fd2cf5
Author: Aron Budea 
Date:   Wed Feb 21 14:49:11 2018 +0100

tdf#115383: revert mixup of E_ROFS and E_SPIPE in file.hxx

Regression from a9739f2dec197793fa9400dd95be49494dc85264

Change-Id: I1b55b0201888a63bd2439be8c0421f450d609018
Reviewed-on: https://gerrit.libreoffice.org/50103
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Michael Stahl 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index f6764f14ed27..76b2a1bb110f 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -80,8 +80,8 @@ public:
 E_NOTTY= osl_File_E_NOTTY,  ///< inappropriate I/O 
control operation
 E_FBIG = osl_File_E_FBIG,   ///< file too large
 E_NOSPC= osl_File_E_NOSPC,  ///< no space left on 
device, write failed
-E_SPIPE= osl_File_E_ROFS,   ///< invalid seek 
operation (such as on pipe)
-E_ROFS = osl_File_E_SPIPE,  ///< illegal modification 
to read-only filesystem
+E_SPIPE= osl_File_E_SPIPE,  ///< invalid seek 
operation (such as on pipe)
+E_ROFS = osl_File_E_ROFS,   ///< illegal modification 
to read-only filesystem
 E_MLINK= osl_File_E_MLINK,  ///< too many links to file
 E_PIPE = osl_File_E_PIPE,   ///< broken pipe; no 
process reading from other end of pipe
 E_DOM  = osl_File_E_DOM,///< domain error 
(mathematical error)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 623a87a3c338a9b4cdc5d9753388b5956006b8b4
Author: Chris Sherlock 
Date:   Mon Jan 29 01:17:35 2018 +1100

osl: document osl_File_E_NETWORK enum

Change-Id: I4c16ba13820b5cdec03c21a460d3d0ecc7dd86d5
Reviewed-on: https://gerrit.libreoffice.org/48791
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/osl/file.h b/include/osl/file.h
index 16690882cfe1..7d6d22173420 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -130,7 +130,9 @@ typedef enum {
 osl_File_E_NOTREADY,/*!< device not ready  
  */
 osl_File_E_invalidError,/*!< unmapped error: always last entry in 
enum!  */
 osl_File_E_TIMEDOUT,/*!< socket operation timed out
  */
-osl_File_E_NETWORK,
+osl_File_E_NETWORK, /*!< unexpected network error occurred 
(Windows) - could be a
+ user session was deleted, or an 
unexpected network error
+ occurred  
  */
 osl_File_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslFileError;
 
@@ -828,7 +830,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileSize(
 can mean that the address, length of the file or the
 file offset are too large or not aligned on a page
 boundary; on Linux can also mean after Linux 2.6.12
-that the length was set to 0 (illogical.
+that the length was set to 0 (illogical).
 @retval osl_File_E_OVERFLOW requested mapping size too large,
 or the file offset was too large
 @retval osl_File_E_ACCES file descriptor to non-regular file, or
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Milian Wolff]

 include/osl/process.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cca67d26b6d503ab7dcf3a05fb77fe648cd25f2c
Author: Milian Wolff 
Date:   Tue Jan 23 17:40:51 2018 +0100

Fix documentation for osl_executeProcess_WithRedirectedIO

The file handle arguments are out parameters, not input parameters.

Change-Id: Iad604e4df9e89a8f83c4cb6a3faa35ee20cd80aa
Reviewed-on: https://gerrit.libreoffice.org/48450
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins 

diff --git a/include/osl/process.h b/include/osl/process.h
index a2c1eed4193c..f3aa86d2f6dc 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -203,17 +203,17 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_executeProcess(
 Pointer to a oslProcess variable, which receives the handle of the newly 
created process.
 This parameter must not be NULL.
 
-@param[in] pChildInputWrite
+@param[out] pChildInputWrite
 Pointer to a oslFileHandle variable that receives the handle which can be 
used to write
 to the child process standard input device. The returned handle is not 
random accessible.
 The handle has to be closed with osl_closeFile if no longer used. This 
parameter can be NULL.
 
-@param[in] pChildOutputRead
+@param[out] pChildOutputRead
 Pointer to a oslFileHandle variable that receives the handle which can be 
used to read from
 the child process standard output device. The returned handle is not 
random accessible.
 The Handle has to be closed with osl_closeFile if no longer used. This 
parameter can be NULL.
 
-@param[in] pChildErrorRead
+@param[out] pChildErrorRead
 Pointer to a oslFileHandle variable that receives the handle which can be 
used to read from
 the child process standard error device. The returned handle is not random 
accessible.
 The Handle has to be closed with osl_closeFile if no longer used. This 
parameter can be NULL.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl

[Stephan Bergmann]

 include/osl/diagnose.hxx  |3 ---
 sal/osl/all/debugbase.cxx |3 ---
 2 files changed, 6 deletions(-)

New commits:
commit 4f0a97a81dc9aa93dd6579590110a1ea71154351
Author: Stephan Bergmann 
Date:   Tue Dec 19 12:24:07 2017 +0100

Clang 3.5 has -Wreturn-type-c-linkage

Change-Id: I9d4b8aef3877f46c537937f7cb04c7654f057fa2
Reviewed-on: https://gerrit.libreoffice.org/46789
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index 0dc140faef83..7cd0c106a584 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -65,9 +65,6 @@ SAL_DLLPUBLIC void SAL_CALL 
osl_detail_ObjectRegistry_revokeObject(
 // that would break binary compatibility.
 #ifdef __clang__
 #pragma clang diagnostic push
-// Guard against slightly older clang versions that don't have
-// -Wreturn-type-c-linkage...
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
 #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
 #endif
 
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 3c2f6c67b1e7..3534b9a828c4 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -68,9 +68,6 @@ extern "C" {
 // that would break binary compatibility.
 #ifdef __clang__
 #pragma clang diagnostic push
-// Guard against slightly older clang versions that don't have
-// -Wreturn-type-c-linkage...
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
 #pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket_decl.hxx |   57 +---
 1 file changed, 38 insertions(+), 19 deletions(-)

New commits:
commit a486a379ba868ec0198755ad75a5312bf693ad5c
Author: Chris Sherlock 
Date:   Wed Aug 30 02:04:07 2017 +1000

osl: partial cleanup of socket_decl.hxx doxygen comments

Change-Id: Ie7de4fb82a6e5162bb1732baaa742f1943559ce6

diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index 2c9020e3e93d..c470cd65f26f 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -32,7 +32,7 @@ namespace osl
 {
 enum __osl_socket_NoCopy { SAL_NO_COPY };
 
-/** The class should be understood as a reference to a socket address 
handle ( struct sockaddr ).
+/** The class should be understood as a reference to a socket address 
handle (struct sockaddr).
 
 The handle is mutable.
  */
@@ -54,66 +54,85 @@ namespace osl
 inline SocketAddr(SocketAddr && other);
 #endif
 
-/** The SocketAddr takes over the responsibility of the handle ( which 
means,
+/** The SocketAddr takes over the responsibility of the handle (which 
means
 that the handle gets destructed by the destructor of this 
reference)
-@param Addr a handle
-@param nocopy use SAL_NO_COPY
+
+@param Addr a handle
+@param nocopy   use SAL_NO_COPY
  */
 inline SocketAddr(const oslSocketAddr Addr, __osl_socket_NoCopy nocopy 
);
 
 /** Copyconstructs the oslSocketAddr handle.
+
+@param Addr a handle
  */
 inline SocketAddr(oslSocketAddr Addr);
 
-/** tcpip-specific constructor.
+/** TCP/IP-specific constructor.
+
 @param strAddrOrHostName strAddrOrHostName hostname or dotted 
ip-number of the network
  interface, the socket shall be created on.
 @param nPort tcp-ip port number
  */
-inline SocketAddr( const ::rtl::OUString& strAddrOrHostName, sal_Int32 
nPort );
+inline SocketAddr(const ::rtl::OUString& strAddrOrHostName, sal_Int32 
nPort);
 
 /** destroys underlying oslSocketAddress
  */
 inline ~SocketAddr();
 
-/** checks, if the SocketAddr was created successful.
-@return true if there is a valid underlying handle,
-otherwise false.
+/** Checks if the SocketAddr was created successful.
+
+@retval trueif there is a valid underlying handle
+@retval false   no valid underlying handle
  */
 inline bool is() const;
 
 /** Converts the address to a (human readable) domain-name.
 
-@param pResult 0, if you are not interested in errors,
+@param pResult[out] value of 0 if you are not interested in errors,
otherwise *pResult contains an error code on failure
or osl_Socket_Ok on success
+
 @return the hostname of this SocketAddr or an empty string on 
failure.
-@see osl_getHostnameOfSocketAddr()
+
+@see osl_getHostnameOfSocketAddr
 */
-inline ::rtl::OUString SAL_CALL getHostname( oslSocketResult *pResult 
= NULL ) const;
+inline ::rtl::OUString SAL_CALL getHostname(oslSocketResult *pResult = 
NULL) const;
 
-/** Sets the ipaddress or hostname of the SocketAddress
+/** Sets the IP address or hostname of the SocketAddress
+
+   @param sDottedIpOrHostname[in]   IP address or hostname
+
+   @retval true success
+   @retval falsefailure
  */
-inline bool SAL_CALL setHostname( const ::rtl::OUString 
 );
+inline bool SAL_CALL setHostname(const ::rtl::OUString 
);
 
 /** Returns the port number of the address.
+
 @return the port in host-byte order or OSL_INVALID_PORT on errors.
 */
 inline sal_Int32 SAL_CALL getPort() const;
 
 /** Sets the port number of the address.
-   @return true if successful.
+
+   @param nPort[in] port number
+
+   @retval true success
+   @retval falsefailure
  */
-inline bool SAL_CALL setPort( sal_Int32 nPort );
+inline bool SAL_CALL setPort(sal_Int32 nPort);
 
 /** Sets the address of the underlying socket address struct in 
network byte order.
-@return true on success, false signals failure.
+
+   @retval true success
+   @retval falsefailure
  */
-inline bool SAL_CALL setAddr( const ::rtl::ByteSequence & address );
+inline bool SAL_CALL setAddr(const ::rtl::ByteSequence & address);
 
 /** Returns the address of the underlying socket in network byte order
   */
-inline ::rtl::ByteSequence  SAL_CALL getAddr( oslSocketResult *pResult 
= NULL 

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.h |  431 +--
 1 file changed, 215 insertions(+), 216 deletions(-)

New commits:
commit e002de40ca970933d44eec9601e11ea2b8080293
Author: Chris Sherlock 
Date:   Mon Aug 28 05:23:06 2017 +1000

osl: rearrange socket.h sections

Change-Id: I4a288699f2b313d7519554d7a66dc5f591c8767b
Reviewed-on: https://gerrit.libreoffice.org/41613
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 0757270c2cc8..00d0d4f931fe 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -39,7 +39,6 @@ extern "C" {
 */
 typedef struct oslSocketAddrImpl * oslSocketAddr;
 
-
 /**
 Represents the address-family of a socket
 */
@@ -126,7 +125,6 @@ typedef enum  {
 osl_Socket_Level_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketOptionLevel;
 
-
 /**
 Represents flags to be used with send/recv-calls.
 */
@@ -208,213 +206,21 @@ typedef sal_uInt8 oslSocketIpxNodeNumber[6];
 /**@} end section types
 */
 
-/**@{ begin section oslSocketAddr
-*/
-
-/** Creates a socket-address for the given family.
-@param Family If family == osl_Socket_FamilyInet the address is
-  set to INADDR_ANY port 0.
-@return 0 if address could not be created.
-*/
-SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createEmptySocketAddr(
-oslAddrFamily Family);
-
-
-/** Creates a new SocketAddress and fills it from Addr.
-*/
-SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_copySocketAddr(
-oslSocketAddr Addr);
-
-/** Compares the values of two SocketAddresses.
-@retval sal_True if both addresses denote the same socket address.
-@retval sal_False if both addresses do not denote the same socket address.
-*/
-SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isEqualSocketAddr(
-oslSocketAddr Addr1, oslSocketAddr Addr2);
-
-/** Uses the systems name-service interface to find an address for strHostname.
-@param[in] strHostname The name for which you search for an address.
-@return The desired address if one could be found, otherwise 0.
-Don't forget to destroy the address if you don't need it any longer.
-*/
-SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_resolveHostname(
-rtl_uString *strHostname);
-
-/** Create an internet address usable for sending broadcast datagrams.
-To limit the broadcast to your subnet, pass your hosts IP address
-in dotted decimal notation as first argument.
-@seeosl_sendToSocket()
-@seeoslSocketAddr
-@param[in]  strDottedAddr dotted decimal internet address, may be 0.
-@param[in]  Port port number in host byte order.
-@retval 0 if address could not be created.
-*/
-SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetBroadcastAddr(
-rtl_uString *strDottedAddr, sal_Int32 Port);
-
-
-/** Create an internet-address, consisting of host address and port.
-We interpret strDottedAddr as a dotted-decimal inet-addr
-(e.g. "141.99.128.50").
-@param[in] strDottedAddr  String with dotted address.
-@param[in] Port  portnumber in host byte order.
-@retval 0 if address could not be created.
-*/
-SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetSocketAddr (
-rtl_uString *strDottedAddr, sal_Int32 Port);
-
-
-/** Frees all resources allocated by Addr. The handle Addr must not
-be used after the call anymore.
-*/
-SAL_DLLPUBLIC void SAL_CALL osl_destroySocketAddr(
-oslSocketAddr Addr);
-
-/** Looks up the port-number designated to the specified service/protocol-pair.
-(e.g. "ftp" "tcp").
-@retval OSL_INVALID_PORT if no appropriate entry was found, otherwise the 
port-number.
-*/
-SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getServicePort(
-rtl_uString *strServicename, rtl_uString *strProtocol);
-
-
-
-/** Retrieves the address-family from the Addr.
-@return the family of the socket-address.
-In case of an unknown family you get osl_Socket_FamilyInvalid.
-*/
-SAL_DLLPUBLIC oslAddrFamily SAL_CALL osl_getFamilyOfSocketAddr(
-oslSocketAddr Addr);
-
-
-/** Retrieves the internet port-number of Addr.
-@return the port-number of the address in host-byte order. If Addr
-is not an address of type osl_Socket_FamilyInet, it returns 
OSL_INVALID_PORT
-*/
-SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(
-oslSocketAddr Addr);
-
-
-/** Sets the Port of Addr.
-@param[in] Addr the SocketAddr to perfom the operation on.
-@param[in] Port is expected in host byte-order.
-@retval sal_False if Addr is not an inet-addr.
-*/
-SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setInetPortOfSocketAddr(
-oslSocketAddr Addr, sal_Int32 Port);
-
-
-/** Returns the hostname represented by Addr.
-@param[in] Addr The socket address from which to extract the hostname.
-@param[out] strHostname The hostname represented by the address. If
-there is no hostname to be 

[Libreoffice-commits] core.git: include/osl

[Andrea Gelmini]

 include/osl/socket.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c4bc3822298a663c31c676648262c223c1be4ab6
Author: Andrea Gelmini 
Date:   Sun Aug 27 15:20:00 2017 +0200

Fix typos

Change-Id: I3097ef16912f72b59f0759d8826068cbb9b00ec2
Reviewed-on: https://gerrit.libreoffice.org/41606
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 1cf3d34c94d2..0757270c2cc8 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -74,7 +74,7 @@ typedef enum {
  sockets   
 */
 osl_Socket_TypeSeqPacket,   /*!< connection-oriented and reliable
  two-way transport of ordered byte
- steams
 */
+ streams   
 */
 osl_Socket_TypeInvalid, /*!< always last entry in enum 
 */
 osl_Socket_Type_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketType;
@@ -87,11 +87,11 @@ typedef enum {
 osl_Socket_OptionDebug, /*!< record debugging info 
 */
 osl_Socket_OptionAcceptConn,/*!< listen for connection 
 */
 osl_Socket_OptionReuseAddr, /*!< bind to address already in use
 */
-osl_Socket_OptionKeepAlive, /*!< use keep-alives   
 */
+osl_Socket_OptionKeepAlive, /*!< use keep-alive
 */
 osl_Socket_OptionDontRoute, /*!< do not route packet, send direct to
  interface addresses   
 */
 osl_Socket_OptionBroadcast, /*!< send broadcast message
 */
-osl_Socket_OptionUseLoopback,   /*!< socket recieves copy of everything
+osl_Socket_OptionUseLoopback,   /*!< socket receives copy of everything
  sent on the socket
 */
 osl_Socket_OptionLinger,/*!< don't immediately close - "linger"
  a while to allow for graceful
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0876a6f05d78b9754005f8bd70f79386b44a7813
Author: Chris Sherlock 
Date:   Mon Aug 28 03:39:07 2017 +1000

osl: fix socket.h doxygen param

Change-Id: I4299433ec30ee5d102750b41e8cc6e82e4530a59

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 156179f2e6fd..1cf3d34c94d2 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -660,7 +660,7 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isExceptionPending(
 
 /** Shuts down communication on a connected socket.
 @param[in] Socket the Socket to perfom the operation on.
-@param[in]
+@param[in] Direction
 @parblock
 Direction denotes which end of the socket should be closed:
 @li osl_Socket_DirRead - closes read operations.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.h |  163 +++
 1 file changed, 89 insertions(+), 74 deletions(-)

New commits:
commit 8f60fe1af60944092c28f5a534af6f10cf9f6ba9
Author: Chris Sherlock 
Date:   Sun Aug 27 16:05:10 2017 +1000

osl: document socket enums

Change-Id: I6f4904d415a44ba20ec0a9bfea9876c50eedb968

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 71a53da4282b..156179f2e6fd 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -44,9 +44,9 @@ typedef struct oslSocketAddrImpl * oslSocketAddr;
 Represents the address-family of a socket
 */
 typedef enum {
-osl_Socket_FamilyInet,  /* IP */
-osl_Socket_FamilyIpx,   /* Novell IPX/SPX */
-osl_Socket_FamilyInvalid,   /* always last entry in enum! */
+osl_Socket_FamilyInet,  /*!< IP (AF_INET)  
 */
+osl_Socket_FamilyIpx,   /*!< Novell IPX/SPX (AF_IPX)   
 */
+osl_Socket_FamilyInvalid,   /*!< always last entry in enum!
 */
 osl_Socket_Family_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslAddrFamily;
 
@@ -54,11 +54,11 @@ typedef enum {
 represent a specific protocol within a address-family
 */
 typedef enum {
-osl_Socket_ProtocolIp,  /* for all af_inet */
-osl_Socket_ProtocolIpx, /* af_ipx datagram sockets (IPX) */
-osl_Socket_ProtocolSpx, /* af_ipx seqpacket or stream for SPX */
-osl_Socket_ProtocolSpxII,   /* af_ipx seqpacket or stream for SPX II */
-osl_Socket_ProtocolInvalid,
+osl_Socket_ProtocolIp,  /*!< for all af_inet   
 */
+osl_Socket_ProtocolIpx, /*!< af_ipx datagram sockets (IPX) 
 */
+osl_Socket_ProtocolSpx, /*!< af_ipx seqpacket or stream for SPX
 */
+osl_Socket_ProtocolSpxII,   /*!< af_ipx seqpacket or stream for SPX II 
 */
+osl_Socket_ProtocolInvalid, /*!< always last entry in enum 
 */
 osl_Socket_Protocol_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslProtocol;
 
@@ -66,12 +66,16 @@ typedef enum {
 Represents the type of a socket
 */
 typedef enum {
-osl_Socket_TypeStream,
-osl_Socket_TypeDgram,
-osl_Socket_TypeRaw,
-osl_Socket_TypeRdm,
-osl_Socket_TypeSeqPacket,
-osl_Socket_TypeInvalid, /* always last entry in enum! */
+osl_Socket_TypeStream,  /*!< stream socket 
 */
+osl_Socket_TypeDgram,   /*!< datagram socket   
 */
+osl_Socket_TypeRaw, /*!< raw socket
 */
+osl_Socket_TypeRdm, /*!< connectionless, message-oriented,
+ reliably delivered message (RDM)
+ sockets   
 */
+osl_Socket_TypeSeqPacket,   /*!< connection-oriented and reliable
+ two-way transport of ordered byte
+ steams
 */
+osl_Socket_TypeInvalid, /*!< always last entry in enum 
 */
 osl_Socket_Type_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketType;
 
@@ -80,25 +84,35 @@ typedef enum {
 Represents socket-options
 */
 typedef enum {
-osl_Socket_OptionDebug,
-osl_Socket_OptionAcceptConn,
-osl_Socket_OptionReuseAddr,
-osl_Socket_OptionKeepAlive,
-osl_Socket_OptionDontRoute,
-osl_Socket_OptionBroadcast,
-osl_Socket_OptionUseLoopback,
-osl_Socket_OptionLinger,
-osl_Socket_OptionOOBinLine,
-osl_Socket_OptionSndBuf,
-osl_Socket_OptionRcvBuf,
-osl_Socket_OptionSndLowat,
-osl_Socket_OptionRcvLowat,
-osl_Socket_OptionSndTimeo,
-osl_Socket_OptionRcvTimeo,
-osl_Socket_OptionError,
-osl_Socket_OptionType,
-osl_Socket_OptionTcpNoDelay,
-osl_Socket_OptionInvalid,   /* always last entry in enum! */
+osl_Socket_OptionDebug, /*!< record debugging info 
 */
+osl_Socket_OptionAcceptConn,/*!< listen for connection 
 */
+osl_Socket_OptionReuseAddr, /*!< bind to address already in use
 */
+osl_Socket_OptionKeepAlive, /*!< use keep-alives   
 */
+osl_Socket_OptionDontRoute, /*!< do not route packet, send direct to
+ interface addresses   
 */
+osl_Socket_OptionBroadcast, /*!< send broadcast message
 */
+osl_Socket_OptionUseLoopback,   /*!< socket recieves copy of everything
+ sent on the socket
 */
+osl_Socket_OptionLinger,/*!< don't immediately close - "linger"
+ a while to allow for graceful
+ connection closure
 */
+

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.h |  174 +++
 1 file changed, 94 insertions(+), 80 deletions(-)

New commits:
commit 1fab08fbeadc072f0196a7245785a6ab63474135
Author: Chris Sherlock 
Date:   Sun Aug 27 13:16:35 2017 +1000

osl: cleanup socket.h

Change-Id: I0f7889db570717e9606425b51a418c499bd3a40a

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 796b3490223f..71a53da4282b 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -179,11 +179,11 @@ typedef enum {
 /** Common return codes of socket related functions.
  */
 typedef enum {
-osl_Socket_Ok,  /* successful completion */
-osl_Socket_Error,   /* error occurred, check osl_getLastSocketError() 
for details */
-osl_Socket_TimedOut,/* blocking operation timed out */
-osl_Socket_Interrupted, /* blocking operation was interrupted */
-osl_Socket_InProgress,  /* nonblocking operation is in progress */
+osl_Socket_Ok,  /* successful completion */
+osl_Socket_Error,   /* error occurred, check 
osl_getLastSocketError() for details */
+osl_Socket_TimedOut,/* blocking operation timed out */
+osl_Socket_Interrupted, /* blocking operation was interrupted */
+osl_Socket_InProgress,  /* nonblocking operation is in progress */
 osl_Socket_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslSocketResult;
 
@@ -234,7 +234,7 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_resolveHostname(
 @param[in]  Port port number in host byte order.
 @retval 0 if address could not be created.
 */
-SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
+SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetBroadcastAddr(
 rtl_uString *strDottedAddr, sal_Int32 Port);
 
 
@@ -266,7 +266,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getServicePort(
 
 /** Retrieves the address-family from the Addr.
 @return the family of the socket-address.
-In case of an unknown family you get osl_Socket_FamilyInvalid.
+In case of an unknown family you get osl_Socket_FamilyInvalid.
 */
 SAL_DLLPUBLIC oslAddrFamily SAL_CALL osl_getFamilyOfSocketAddr(
 oslSocketAddr Addr);
@@ -274,7 +274,7 @@ SAL_DLLPUBLIC oslAddrFamily SAL_CALL 
osl_getFamilyOfSocketAddr(
 
 /** Retrieves the internet port-number of Addr.
 @return the port-number of the address in host-byte order. If Addr
-is not an address of type osl_Socket_FamilyInet, it returns 
OSL_INVALID_PORT
+is not an address of type osl_Socket_FamilyInet, it returns 
OSL_INVALID_PORT
 */
 SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(
 oslSocketAddr Addr);
@@ -299,11 +299,12 @@ SAL_DLLPUBLIC oslSocketResult SAL_CALL 
osl_getHostnameOfSocketAddr(
 
 
 /** Gets the address in dotted decimal format.
+
 @param[in] Addr The socket address from which to extract the dotted 
decimal address.
 @param[out] strDottedInetAddr Contains the dotted decimal address
 (e.g. 141.99.20.34) represented by the address.
-If the address is invalid or not of type 
osl_Socket_FamilyInet,
-it returns 0.
+
+@retval If the address is invalid or not of type osl_Socket_FamilyInet, it 
returns 0.
 @retval osl_Socket_Ok
 @retval osl_Socket_Error
 */
@@ -402,14 +403,14 @@ typedef struct oslSocketImpl * oslSocket;
 
 /** increases the refcount of the socket handle by one
  */
-SAL_DLLPUBLIC void SAL_CALL osl_acquireSocket( oslSocket Socket );
+SAL_DLLPUBLIC void SAL_CALL osl_acquireSocket(oslSocket Socket);
 
 /** decreases the refcount of the socket handle by one.
 
 If the refcount drops to zero, the underlying socket handle
 is destroyed and becomes invalid.
  */
-SAL_DLLPUBLIC void SAL_CALL osl_releaseSocket( oslSocket Socket );
+SAL_DLLPUBLIC void SAL_CALL osl_releaseSocket(oslSocket Socket);
 
 /** Create a socket of the specified Family and Type. The semantic of
 the Protocol parameter depends on the given family and type.
@@ -417,9 +418,9 @@ SAL_DLLPUBLIC void SAL_CALL osl_releaseSocket( oslSocket 
Socket );
 to the allocated socket-datastructure.
 */
 SAL_DLLPUBLIC oslSocket SAL_CALL osl_createSocket(
-oslAddrFamily   Family,
-oslSocketType   Type,
-oslProtocol Protocol);
+oslAddrFamily Family,
+oslSocketType Type,
+oslProtocol Protocol);
 
 /** Retrieves the Address of the local end of the socket.
 Note that a socket must be bound or connected before
@@ -445,8 +446,8 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL 
osl_getPeerAddrOfSocket(oslSocket Socket);
 @see osl_getLastSocketError()
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_bindAddrToSocket(
-   oslSocket Socket,
-   oslSocketAddr Addr);
+   

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/thread.h |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1ab6d39146b6ff0a633ae0821e2db5705d3ad6c3
Author: Chris Sherlock 
Date:   Sun Aug 27 01:36:41 2017 +1000

osl: clarify osl_scheduleThread() documentation

Change-Id: If9990acd06f5395c07d44fc462292ccae795abe1

diff --git a/include/osl/thread.h b/include/osl/thread.h
index 0a7951a4441d..4025f608693c 100644
--- a/include/osl/thread.h
+++ b/include/osl/thread.h
@@ -164,11 +164,13 @@ SAL_DLLPUBLIC void SAL_CALL osl_waitThread(const 
TimeValue* pDelay);
 */
 SAL_DLLPUBLIC void SAL_CALL osl_terminateThread(oslThread Thread);
 
-/** Offers the rest of the threads time-slice to the OS.
-scheduleThread() should be called in the working loop
+/** Schedules in thread to wait till after time slice of specified
+thread. scheduleThread() should be called in the working loop
 of the thread, so any other thread could also get the
 processor. Returns False if the thread should terminate, so
 the thread could free any allocated resources.
+
+@param Thread   Handle to thread to schedule in after
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_scheduleThread(oslThread Thread);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/thread.h |   34 +-
 1 file changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 4aee9d3283b93bc617474b94afa9395495c3792b
Author: Chris Sherlock 
Date:   Sun Aug 27 01:31:47 2017 +1000

osl: thread doxygen update

Change-Id: I345fdc1facd3eb38e2304f313c1eb67dc32b3608

diff --git a/include/osl/thread.h b/include/osl/thread.h
index be7999e5468d..0a7951a4441d 100644
--- a/include/osl/thread.h
+++ b/include/osl/thread.h
@@ -66,6 +66,10 @@ typedef void* oslThreadKey;
 its void* parameter the value supplied by pThreadData.
 Once the OS-structures are initialized,the thread starts
 running.
+
+@param pWorker  Thread worker function
+@param pThreadData  Thread local data
+
 @return 0 if creation failed, otherwise a handle to the thread
 */
 SAL_DLLPUBLIC oslThread SAL_CALL osl_createThread(oslWorkerFunction pWorker, 
void* pThreadData);
@@ -75,12 +79,19 @@ SAL_DLLPUBLIC oslThread SAL_CALL 
osl_createThread(oslWorkerFunction pWorker, voi
 its void* parameter the value supplied by pThreadData.
 The thread will be created, but it won't start running.
 To wake-up the thread, use resume().
+
+@param pWorker  Thread worker function
+@param pThreadData  Thread local data
+
 @return 0 if creation failed, otherwise a handle to the thread
 */
 SAL_DLLPUBLIC oslThread SAL_CALL osl_createSuspendedThread(oslWorkerFunction 
pWorker, void* pThreadData);
 
 /** Get the identifier for the specified thread or if parameter
 Thread is NULL of the current active thread.
+
+@param Thread   Handle to thread for the thread ID
+
 @return identifier of the thread
 */
 SAL_DLLPUBLIC oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread 
Thread);
@@ -89,48 +100,67 @@ SAL_DLLPUBLIC oslThreadIdentifier SAL_CALL 
osl_getThreadIdentifier(oslThread Thr
 If Thread is NULL, the function won't do anything.
 Note that we do not interfere with the actual running of
 the thread, we just free up the memory needed by the handle.
+
+@param Thread   Handle to thread to release
 */
 SAL_DLLPUBLIC void SAL_CALL osl_destroyThread(oslThread Thread);
 
 /** Wake-up a thread that was suspended with suspend() or
 createSuspended(). The oslThread must be valid!
+
+@param Thread   Handle to thread to resume
 */
 SAL_DLLPUBLIC void SAL_CALL osl_resumeThread(oslThread Thread);
 
 /** Suspend the execution of the thread. If you want the thread
 to continue, call resume(). The oslThread must be valid!
+
+@param Thread   Handle to thread to suspend
 */
 SAL_DLLPUBLIC void SAL_CALL osl_suspendThread(oslThread Thread);
 
 /** Changes the threads priority.
 The oslThread must be valid!
+
+@param Thread   Handle to thread to which to change priority
+@param Priority Thread priority
 */
 SAL_DLLPUBLIC void SAL_CALL osl_setThreadPriority(oslThread Thread, 
oslThreadPriority Priority);
 
 /** Retrieves the threads priority.
 Returns oslThreadPriorityUnknown for invalid Thread-argument or
-terminated thread. (I.e.: The oslThread might be invalid.)
+terminated thread. (i.e. the oslThread might be invalid.)
+
+@param Thread   Handle to thread for which the priority is retrieved
 */
 SAL_DLLPUBLIC oslThreadPriority SAL_CALL osl_getThreadPriority(const oslThread 
Thread);
 
 /** Returns True if the thread was created and has not terminated yet.
 Note that according to this definition a "running" thread might be
 suspended! Also returns False is Thread is NULL.
+
+@param Thread   Handle to thread
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isThreadRunning(const oslThread Thread);
 
 /** Blocks the calling thread until Thread has terminated.
 Returns immediately if Thread is NULL.
+
+@param Thread   Handle to thread to join
 */
 SAL_DLLPUBLIC void SAL_CALL osl_joinWithThread(oslThread Thread);
 
 /** Suspends the execution of the calling thread for at least the given
 time.
+
+@param pDelay   Timeout value to wait
 */
 SAL_DLLPUBLIC void SAL_CALL osl_waitThread(const TimeValue* pDelay);
 
 /** The requested thread will get terminate the next time
 scheduleThread() is called.
+
+@param Thread   Handle to thread to terminate
 */
 SAL_DLLPUBLIC void SAL_CALL osl_terminateThread(oslThread Thread);
 
@@ -160,6 +190,8 @@ SAL_DLLPUBLIC void SAL_CALL osl_yieldThread(void);
 
 @param name  the name of the thread; must not be null; on Linux, only the
 first 16 characters are used
+
+@param name Thread name
 */
 SAL_DLLPUBLIC void SAL_CALL osl_setThreadName(char const * name);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.h |5 -
 1 file changed, 5 deletions(-)

New commits:
commit c0d7f348f20ea1ae0d4b738136be4d5cbff550ae
Author: Chris Sherlock 
Date:   Wed Jul 19 12:52:00 2017 +1000

osl: remove comment cruft osl/socket.h

Change-Id: I785cc08e5450530f885b1bf38b50517029d6fb92

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 2ec3890b3776..796b3490223f 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -398,11 +398,6 @@ SAL_DLLPUBLIC oslSocketResult SAL_CALL 
osl_getLocalHostname(rtl_uString **strLoc
 /**@{ begin section oslSocket
 */
 
-
-/*-***/
-/* oslSocket */
-/*-***/
-
 typedef struct oslSocketImpl * oslSocket;
 
 /** increases the refcount of the socket handle by one
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl include/uno sd/source testtools/source

[Andrea Gelmini]

 include/osl/module.h   |4 ++--
 include/uno/threadpool.h   |2 +-
 sd/source/ui/view/drviewsa.cxx |2 +-
 testtools/source/bridgetest/idl/bridgetest.idl |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9868cefad38b5382f8f683c1ef8064955cc0f093
Author: Andrea Gelmini 
Date:   Mon Jun 26 19:59:21 2017 +0200

Fix typos

Change-Id: If4373f47fdf0ccfcbd490299f8b8d09e17bf92cd
Reviewed-on: https://gerrit.libreoffice.org/39272
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/include/osl/module.h b/include/osl/module.h
index 9d1bbefa328a..6f8468878fba 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -76,7 +76,7 @@ SAL_DLLPUBLIC oslModule SAL_CALL osl_loadModule(rtl_uString 
*strModuleName, sal_
 /** Load a shared library or module.
 
 @param[in] pModuleName denotes the name of the module to be loaded.
-@paramiin] nRtldMode denotes the mode.
+@param[in] nRtldMode denotes the mode.
 
 @return NULL if the module could not be loaded, otherwise a handle to the 
module.
 
@@ -196,7 +196,7 @@ SAL_DLLPUBLIC oslGenericFunction SAL_CALL 
osl_getAsciiFunctionSymbol(
 /** Lookup URL of module which is mapped at the specified address.
 
 @param[in] pv   specifies an address in the process memory space.
-@paramout] pustrURL receives the URL of the module that is mapped at pv.
+@param[out] pustrURL receives the URL of the module that is mapped at pv.
 @return sal_True on success, sal_False if no module can be found at the 
specified address.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_getModuleURLFromAddress(
diff --git a/include/uno/threadpool.h b/include/uno/threadpool.h
index b875b4c67338..49f46db8ec29 100644
--- a/include/uno/threadpool.h
+++ b/include/uno/threadpool.h
@@ -159,7 +159,7 @@ uno_threadpool_putJob(
   The threads waiting with uno_threadpool_enter() will return with *ppJob == 0
 
   Later calls to uno_threadpool_enter() using the hPool handle will also
-  return immeadiatly with *ppJob == 0.
+  return immediately with *ppJob == 0.
 
   @param hPool The handle to be disposed.
 
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 9482c530f3bd..2a28a1ffb2db 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -381,7 +381,7 @@ bool DrawViewShell::RelocateToParentWindow (vcl::Window* 
pParentWindow)
  */
 
 /*
-Polylines are represented by makros as a sequence of:
+Polylines are represented by macros as a sequence of:
 MoveTo (x, y)
 LineTo (x, y)   [or BezierTo (x, y)]
 LineTo (x, y)
diff --git a/testtools/source/bridgetest/idl/bridgetest.idl 
b/testtools/source/bridgetest/idl/bridgetest.idl
index 22612b8dfc36..a14330c8ebef 100644
--- a/testtools/source/bridgetest/idl/bridgetest.idl
+++ b/testtools/source/bridgetest/idl/bridgetest.idl
@@ -161,7 +161,7 @@ struct TestPolyStruct2 {
 interface XRecursiveCall : com::sun::star::uno::XInterface
 {
 /***
- * @param nToCall If nToCall is 0, the method returns immeadiatly.
+ * @param nToCall If nToCall is 0, the method returns immediately.
  *Otherwise, call the given interface with nToCall -1
  *
  ***/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/pipe.h |   67 +
 1 file changed, 48 insertions(+), 19 deletions(-)

New commits:
commit 2f7088999dc3aa7a4032e2a593b49a146854897e
Author: Chris Sherlock 
Date:   Sun Jun 25 04:49:20 2017 +1000

osl: document pipe functionality

Change-Id: I1b2fa0db88bf9b25283ff532f9634eb4605775c3
Reviewed-on: https://gerrit.libreoffice.org/39221
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/include/osl/pipe.h b/include/osl/pipe.h
index 82604334d178..5c176dd48250 100644
--- a/include/osl/pipe.h
+++ b/include/osl/pipe.h
@@ -32,41 +32,70 @@ extern "C" {
 #endif
 
 typedef enum {
-osl_Pipe_E_None,/* no error */
-osl_Pipe_E_NotFound,/* Pipe could not be found */
-osl_Pipe_E_AlreadyExists,   /* Pipe already exists */
-osl_Pipe_E_NoProtocol,  /* Protocol not available */
-osl_Pipe_E_NetworkReset,/* Network dropped connection because of 
reset */
-osl_Pipe_E_ConnectionAbort, /* Software caused connection abort */
-osl_Pipe_E_ConnectionReset, /* Connection reset by peer */
-osl_Pipe_E_NoBufferSpace,   /* No buffer space available */
-osl_Pipe_E_TimedOut,/* Connection timed out */
-osl_Pipe_E_ConnectionRefused,   /* Connection refused */
-osl_Pipe_E_invalidError,/* unmapped error: always last entry in 
enum! */
+osl_Pipe_E_None,/*< no error */
+osl_Pipe_E_NotFound,/*< Pipe could not be found */
+osl_Pipe_E_AlreadyExists,   /*< Pipe already exists */
+osl_Pipe_E_NoProtocol,  /*< Protocol not available */
+osl_Pipe_E_NetworkReset,/*< Network dropped connection because 
of reset */
+osl_Pipe_E_ConnectionAbort, /*< Software caused connection abort */
+osl_Pipe_E_ConnectionReset, /*< Connection reset by peer */
+osl_Pipe_E_NoBufferSpace,   /*< No buffer space available */
+osl_Pipe_E_TimedOut,/*< Connection timed out */
+osl_Pipe_E_ConnectionRefused,   /*< Connection refused */
+osl_Pipe_E_invalidError,/*< unmapped error: always last entry 
in enum! */
 osl_Pipe_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslPipeError;
 
+/** Pipe creation options.
+
+A pipe can either be opened, or a new pipe can be created and opened.
+*/
 typedef sal_uInt32 oslPipeOptions;
-#define osl_Pipe_OPEN0x /* open existing pipe */
-#define osl_Pipe_CREATE  0x0001 /* create pipe and open it, fails if 
already exists */
+#define osl_Pipe_OPEN0x /*< open existing pipe */
+#define osl_Pipe_CREATE  0x0001 /*< create pipe and open it, fails if 
already exists */
 
 typedef struct oslPipeImpl * oslPipe;
 
+/** Create or open a pipe.
+
+@param[in] strPipeName  pipe name
+@param[in] Options  create or open the pipe
+@param[in] Security pipe creator
+
+@returns nullptr on failure, otherwise returns the pipe handle
+
+@see osl_closePipe
+*/
 SAL_DLLPUBLIC oslPipe SAL_CALL osl_createPipe(
 rtl_uString *strPipeName, oslPipeOptions Options, oslSecurity 
Security);
 
-/** decreases the refcount of the pipe.
+/** Decreases the refcount of the pipe.
+
 If the refcount drops to zero, the handle is destroyed.
+
+@param[in] Pipe pipe handle
+
+@see osl_acquirePipe
  */
-SAL_DLLPUBLIC voidSAL_CALL osl_releasePipe( oslPipe );
+SAL_DLLPUBLIC voidSAL_CALL osl_releasePipe(oslPipe Pipe);
+
+/** Increases the refcount of the pipe.
+
+@param[in] Pipe pipe handle
 
-/** increases the refcount of the pipe.
+@see osl_releasePipe
  */
-SAL_DLLPUBLIC voidSAL_CALL osl_acquirePipe( oslPipe Pipe );
+SAL_DLLPUBLIC voidSAL_CALL osl_acquirePipe(oslPipe Pipe);
+
+/** Close the pipe.
+
+Any read, write or accept actions stop immediately.
+
+@param[in] Pipe pipe handle
 
-/** closes the pipe, any read,write or accept actions stop immeadiatly.
+@see osl_createPipe
  */
-SAL_DLLPUBLIC voidSAL_CALL osl_closePipe( oslPipe );
+SAL_DLLPUBLIC voidSAL_CALL osl_closePipe(oslPipe Pipe);
 
 
 SAL_DLLPUBLIC oslPipe SAL_CALL osl_acceptPipe(oslPipe Pipe);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 74b98e04d604b6713f0a66a8337db6a3c79ad23e
Author: Chris Sherlock 
Date:   Sun Jun 25 09:15:14 2017 +1000

osl: doxygen parblock

Change-Id: Ica1b604484c855a94c9a21fab04d62c2f5952fe7

diff --git a/include/osl/file.h b/include/osl/file.h
index 9287987a57f2..5708bc4cfc7d 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1419,14 +1419,18 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_getFileURLFromSystemPath(
 A system dependent path, a file URL, a file or relative directory.
 
 @param[in] pustrSearchPath
-A list of system paths, in which a given file has to be searched. The 
Notation of a path
-list is system dependent, e.g. on UNIX system "/usr/bin:/bin" and on 
Windows "C:\BIN;C:\BATCH".
-These paths are only for the search of a file or a relative path, 
otherwise it will be ignored.
-If pustrSearchPath is NULL or while using the search path the search 
failed, the function
-searches for a matching file in all system directories and in the 
directories listed in the PATH
-environment variable. The value of an environment variable should be 
used (e.g.
-LD_LIBRARY_PATH) if the caller is not aware of the Operating System and so 
doesn't know which
-path list delimiter to use.
+@parblock
+A list of system paths, in which a given file has to be searched. The 
Notation of a path
+list is system dependent, e.g. on UNIX system "/usr/bin:/bin" and on 
Windows "C:\BIN;C:\BATCH".
+These paths are only for the search of a file or a relative path, 
otherwise it will be ignored.
+If pustrSearchPath is NULL or while using the search path the search 
failed, the function
+searches for a matching file in all system directories and in the 
directories listed in the PATH
+environment variable.
+
+The value of an environment variable should be used (e.g.
+LD_LIBRARY_PATH) if the caller is not aware of the Operating System 
and so doesn't know which
+path list delimiter to use.
+@endparblock
 
 @param[out] ppustrFileURL
 On success it receives the full qualified file URL.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/conditn.h |   13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit d88776a05676af89b3d6d798e073acf778206bc1
Author: Chris Sherlock 
Date:   Sun Jun 25 08:27:07 2017 +1000

osl: remove @relates Condition, not relevant

Change-Id: Ifabb961817b8c3cc326264bb9d9bb1c3a4e7e461

diff --git a/include/osl/conditn.h b/include/osl/conditn.h
index a087f3504a49..ace66c624d15 100644
--- a/include/osl/conditn.h
+++ b/include/osl/conditn.h
@@ -45,16 +45,12 @@ typedef enum {
 
 The condition is in the reset-state.
 
-@relates Condition
-
 @retval osl_cond_result_error Condition could not be created.
 */
 SAL_DLLPUBLIC oslCondition SAL_CALL osl_createCondition(void);
 
 /** Free the memory used by the condition.
 
-@relates Condition
-
 @param Condition the condition handle.
 */
 SAL_DLLPUBLIC void SAL_CALL osl_destroyCondition(oslCondition Condition);
@@ -63,8 +59,6 @@ SAL_DLLPUBLIC void SAL_CALL osl_destroyCondition(oslCondition 
Condition);
 
 @attention @em all threads waiting on this condition are unblocked!
 
-@relates Condition
-
 @param Condition handle to a created condition.
 @retval False if system-call failed.
 */
@@ -72,8 +66,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setCondition(oslCondition 
Condition);
 
 /** Sets condition to False => wait() will block, check() returns False
 
-@relates Condition
-
 @param Condition handle to a created condition.
 @retval False if system-call failed.
 */
@@ -81,8 +73,6 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL 
osl_resetCondition(oslCondition Condition);
 
 /** Blocks if condition is not set.
 
-@relates Condition
-
 @param Condition handle to a created condition.
 @param pTimeout Timeout value or NULL for infinite waiting
 @retval False Condition has been destroyed prematurely or system call has 
failed.
@@ -91,9 +81,8 @@ SAL_DLLPUBLIC oslConditionResult SAL_CALL 
osl_waitCondition(oslCondition Conditi
 
 /** Queries the state of the condition without blocking.
 
-@relates Condition
-
 @param Condition handle to a created condition.
+
 @retval True condition is set
 @retval False condition is not set
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 875fcea2a5605565852f11161cb9bbb80ab95873
Author: Chris Sherlock 
Date:   Sun Jun 25 04:05:07 2017 +1000

osl: the addr parameter of osl_mapFile is [in,out]

Change-Id: I29992bfecf50b5e6a185257b3df404bb474dd225

diff --git a/include/osl/file.h b/include/osl/file.h
index aa62a690e141..9287987a57f2 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -792,7 +792,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileSize(
 returned.
 
 @param[in] Handle   Handle of the file to be mapped.
-@param[out] ppAddr  Memory address of the mapped file
+@param[in,out] ppAddr   Memory address of the mapped file
 @param[in] uLength  Amount to map of the file from the offset
 @param[in] uOffset  Offset into the file to map
 @param[in] uFlags   osl_File_MapFlag_RandomAccess or
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h|  190 ++---
 include/osl/file.hxx  |  104 +++
 include/osl/module.hxx|   10 -
 include/osl/mutex.h   |6 
 include/osl/pipe_decl.hxx |   48 ---
 include/osl/process.h |  135 ++--
 include/osl/profile.h |4 
 include/osl/security_decl.hxx |   11 +
 include/osl/signal.h  |5 
 include/osl/socket.h  |  275 +++---
 include/osl/socket_decl.hxx   |   16 +-
 include/osl/thread.hxx|2 
 include/osl/time.h|2 
 13 files changed, 406 insertions(+), 402 deletions(-)

New commits:
commit ba4831629e93bd6957ed8cfce9cec25f4f8ce5e4
Author: Chris Sherlock 
Date:   Fri Jun 23 06:08:00 2017 +1000

osl: doxygen fixes for headers

Change-Id: I3f30b5ab985c2ff709116568905b941c5d50fd1a

diff --git a/include/osl/file.h b/include/osl/file.h
index 9b9e31e5bf11..62601b747b55 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -139,10 +139,10 @@ typedef void *oslDirectoryItem;
 
 /** Open a directory for enumerating its contents.
 
-@param  pustrDirectoryURL [in]
+@param[in]  pustrDirectoryURL
 The full qualified URL of the directory.
 
-@param  pDirectory [out]
+@param[out]  pDirectory
 On success it receives a handle used for subsequent calls by 
osl_getNextDirectoryItem().
 The handle has to be released by a call to osl_closeDirectory().
 
@@ -168,14 +168,14 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openDirectory(
 Retrieves the next item of a previously opened directory.
 All handles have an initial refcount of 1.
 
-@param  Directory [in]
+@param[in]  Directory
 A directory handle received from a previous call to osl_openDirectory().
 
-@param  pItem [out]
+@param[out]  pItem
 On success it receives a handle that can be used for subsequent calls to 
osl_getFileStatus().
 The handle has to be released by a call to osl_releaseDirectoryItem().
 
-@param  uHint [in]
+@param[in]  uHint
 With this parameter the caller can tell the implementation that (s)he
 is going to call this function uHint times afterwards. This enables the 
implementation to
 get the information for more than one file and cache it until the next 
calls.
@@ -200,7 +200,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_getNextDirectoryItem(
 
 /** Release a directory handle.
 
-@param Directory [in]
+@param[in] Directory
 A handle received by a call to osl_openDirectory().
 
 @retval osl_File_E_None on success
@@ -220,10 +220,10 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_closeDirectory(
 Due to performance issues it is not recommended to use this function while
 enumerating the contents of a directory. In this case use 
osl_getNextDirectoryItem() instead.
 
-@param pustrFileURL [in]
+@param[in] pustrFileURL
 An absolute file URL.
 
-@param pItem [out]
+@param[out] pItem
 On success it receives a handle which can be used for subsequent calls to 
osl_getFileStatus().
 The handle has to be released by a call to osl_releaseDirectoryItem().
 
@@ -257,7 +257,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getDirectoryItem(
 
 The caller responsible for releasing the directory item handle using 
osl_releaseDirectoryItem().
 
-@param  Item [in]
+@param[in]  Item
 A handle received by a call to osl_getDirectoryItem() or 
osl_getNextDirectoryItem().
 
 @retval osl_File_E_None on success
@@ -278,7 +278,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_acquireDirectoryItem(
 If the refcount reaches 0 the data associated with
 this directory item handle will be released.
 
-@param  Item [in]
+@param[in]  Item
 A handle received by a call to osl_getDirectoryItem() or 
osl_getNextDirectoryItem().
 
 @retval osl_File_E_None on success
@@ -297,10 +297,10 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_releaseDirectoryItem(
 The comparison is done first by URL, and then by resolving links to
 find the target, and finally by comparing inodes on unix.
 
-@param  pItemA [in]
+@param[in]  pItemA
 A directory handle to compare with another handle
 
-@param  pItemB [in]
+@param[in]  pItemB
 A directory handle to compare with pItemA
 
 @retval sal_True if the items point to an identical resource
@@ -392,15 +392,15 @@ typedef struct _oslFileStatus {
 
 /** Retrieve information about a single file or directory.
 
-@param  Item [in]
+@param[in]  Item
 A handle received by a previous call to osl_getDirectoryItem() or 
osl_getNextDirectoryItem().
 
-@param  pStatus [in|out]
+@param[in,out] pStatus
 Points to a structure which receives the information of the file or 
directory
 represented by the handle Item. The member uStructSize has to be 
initialized to
 sizeof(oslFileStatus) before calling this 

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |   28 
 1 file changed, 28 insertions(+)

New commits:
commit 2b88f432f14e617ad27e6a3f560f85c18603697a
Author: Chris Sherlock 
Date:   Fri Jun 23 04:21:27 2017 +1000

osl: document osl_mapFile parameters and return values

Change-Id: I307662ef0d8360da3cbc7edc96890575715bbf07

diff --git a/include/osl/file.h b/include/osl/file.h
index dec771d6d8b4..9b9e31e5bf11 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -791,6 +791,34 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileSize(
 just a pointer to the file inside the already mapped .apk is
 returned.
 
+@param Handle   [in]Handle of the file to be mapped.
+@param ppAddr   [out]   Memory address of the mapped file
+@param uLength  [in]Amount to map of the file from the offset
+@param uOffset  [in]Offset into the file to map
+@param uFlags   [in]osl_File_MapFlag_RandomAccess or
+osl_File_MapFlag_WillNeed
+
+@retval osl_File_E_None on success
+@retval osl_File_E_INVAL invalid file handle, on Unix systems also
+can mean that the address, length of the file or the
+file offset are too large or not aligned on a page
+boundaryi; on Linux can also mean after Linux 2.6.12
+that the length was set to 0 (illogical.
+@retval osl_File_E_OVERFLOW requested mapping size too large,
+or the file offset was too large
+@retval osl_File_E_ACCES file descriptor to non-regular file, or
+file descriptor not open for reading, or the file
+descriptor is not open in read/write mode
+@retval osl_File_E_AGAIN file has been locked, or too much memory
+has been locked
+@retval osl_File_E_NODEV underlying filesystem of specified file
+does not support memory mapping
+@retval osl_File_E_TXTBSY on Linux means that writing to the mapped
+file is denied, but the file descriptor points to a file
+open for writing
+@retval osl_File_E_NOMEM process's maximum number of mappings have
+been exceeded
+
 @since UDK 3.2.10
 */
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_mapFile (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 97c6719c45c0f095a1f13a5ba2a8743f304e4201
Author: Chris Sherlock 
Date:   Fri Jun 23 03:46:36 2017 +1000

osl: typo from last commit

Change-Id: I3dce45da77c6ab21be5a999d4ea5b7944a07bbd7

diff --git a/include/osl/file.h b/include/osl/file.h
index de0fc2aa4dcd..dec771d6d8b4 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -761,7 +761,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_setFileSize(
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileSize(
 oslFileHandle Handle, sal_uInt64 *pSize );
 
-/** Indicate that the file can be accessws randomly (i.e. there is no 
sequential
+/** Indicate that the file can be accessed randomly (i.e. there is no 
sequential
 reading). Basically it means that the first byte of every page in the
 file-mapping will be read.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |   59 ++---
 1 file changed, 38 insertions(+), 21 deletions(-)

New commits:
commit 1bb4e6c0a1aac9b505416eb1f7c952f6b788afa2
Author: Chris Sherlock 
Date:   Fri Jun 23 03:32:35 2017 +1000

osl: File map flag constants documented

Change-Id: I8f02cfdcaa1a5d2ce981b5de1b9754da36760649
Reviewed-on: https://gerrit.libreoffice.org/39124
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/include/osl/file.h b/include/osl/file.h
index 63a032881adb..de0fc2aa4dcd 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -415,7 +415,8 @@ typedef struct _oslFileStatus {
 @retval osl_File_E_OVERFLOW value too large for defined data type
 @retval osl_File_E_INTR function call was interrupted
 @retval osl_File_E_NOLINK link has been severed
-@retval osl_File_E_MULTIHOP components of path require hopping to multiple 
remote machines and the file system does not allow it
+@retval osl_File_E_MULTIHOP components of path require hopping to multiple
+remote machines and the file system does not allow it
 @retval osl_File_E_MFILE too many open files used by the process
 @retval osl_File_E_NFILE too many open files in the system
 @retval osl_File_E_NOSPC no space left on device
@@ -530,7 +531,8 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_getVolumeDeviceMountPath(
 */
 
 typedef struct _oslVolumeInfo {
-/** Must be initialized with the size in bytes of the structure before passing 
it to any function */
+/** Must be initialized with the size in bytes of the structure before
+passing it to any function */
 sal_uInt32  uStructSize;
 /** Determines which members of the structure contain valid data */
 sal_uInt32  uValidFields;
@@ -546,10 +548,12 @@ typedef struct _oslVolumeInfo {
 sal_uInt32  uMaxNameLength;
 /** Maximum length of a full qualified path in system notation */
 sal_uInt32  uMaxPathLength;
-/** Points to a string that receives the name of the file system type. String 
should be set to zero before calling osl_getVolumeInformation
-and released after usage. */
+/** Points to a string that receives the name of the file system type. String
+should be set to zero before calling osl_getVolumeInformation and released
+after usage. */
 rtl_uString *ustrFileSystemName;
-/** Pointer to handle the receives underlying device. Handle should be set to 
zero before calling osl_getVolumeInformation*/
+/** Pointer to handle the receives underlying device. Handle should be set to
+zero before calling osl_getVolumeInformation */
 oslVolumeDeviceHandle   *pDeviceHandle;
 } oslVolumeInfo;
 
@@ -668,16 +672,20 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFile(
 Handle to a file received by a previous call to osl_openFile().
 
 @param uHow [in]
-How to calculate the offset - osl_Pos_Absolut means start at the beginning 
of the file, osl_Pos_Current means
-offset from the current seek position and osl_Pos_End means the offset 
will be negative and the position will be
-calculated backwards from the end of the file by the offset provided.
+How to calculate the offset - osl_Pos_Absolut means start at the
+beginning of the file, osl_Pos_Current means offset from the current
+seek position and osl_Pos_End means the offset will be negative and
+the position will be calculated backwards from the end of the file by
+the offset provided.
 
 @param uPos [in]
 Seek offset, depending on uHow. If uHow is osl_Pos_End then the value must 
be negative.
 
 @retval osl_File_E_None on success
-@retval osl_File_E_INVAL the format of the parameters was not valid (e.g. 
if uHow is osl_Pos_End then must be negative)
-@retval osl_File_E_OVERFLOW the resulting file offset would be a value 
which cannot be represented correctly for regular files
+@retval osl_File_E_INVAL the format of the parameters was not valid
+(e.g. if uHow is osl_Pos_End then must be negative)
+@retval osl_File_E_OVERFLOW the resulting file offset would be a
+value which cannot be represented correctly for regular files
 
 @seeosl_openFile()
 @seeosl_getFilePos()
@@ -695,7 +703,8 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_setFilePos(
 
 @retval osl_File_E_None on success
 @retval osl_File_E_INVAL the format of the parameters was not valid
-@retval osl_File_E_OVERFLOW the resulting file offset would be a value 
which cannot be represented correctly for regular files
+@retval osl_File_E_OVERFLOW the resulting file offset would be a value
+which cannot be represented correctly for regular files
 
 @see osl_openFile()
 @see osl_setFilePos()
@@ -718,7 +727,8 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFilePos(
 
 @retval osl_File_E_None on success
 @retval 

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann]

 include/osl/conditn.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f239694560701d7cab15e1b8d3bd340fe319c77d
Author: Stephan Bergmann 
Date:   Tue Jun 6 11:27:56 2017 +0200

Fix order of includes again

...after bfb978334cea775b8ae5c40ceea050ea0660d80a "osl: conditin.h and
conditin.hxx doxygen updates"

Change-Id: I63b6fefd2ed9a1c338e01f16c1efc1b6304103bc

diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx
index 43a1d07cb157..5852f376b98b 100644
--- a/include/osl/conditn.hxx
+++ b/include/osl/conditn.hxx
@@ -20,9 +20,10 @@
 #ifndef INCLUDED_OSL_CONDITN_HXX
 #define INCLUDED_OSL_CONDITN_HXX
 
+#include 
+
 #include 
 
-#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 261a2ad41c7478d0771c74825eca74939f7c55ee
Author: Chris Sherlock 
Date:   Fri Jun 2 20:29:40 2017 +1000

osl: explain why in file.h a memory mapped file is "shared"

The original comment reads:

Don't know what the "shared" is supposed to mean there? Also,
obviously this API can be used to map *part* of a file into
memory, and different parts can be mapped separately even.

That's because memory mapped files can be used as a form of IPC
that allows multiple processes to share data.

Change-Id: I3cb34fcdb0a93233b22ac888712f9c1d650b30ea
Reviewed-on: https://gerrit.libreoffice.org/38348
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/include/osl/file.h b/include/osl/file.h
index 73349572063c..01b6288ea0be 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -766,9 +766,8 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileSize(
 
 /** Map a shared file into memory.
 
-Don't know what the "shared" is supposed to mean there? Also,
-obviously this API can be used to map *part* of a file into
-memory, and different parts can be mapped separately even.
+Files can be mapped into memory to allow multiple processes to use
+this memory-mapped file to share data.
 
 On Android, if the Handle refers to a file that is actually inside
 the app package (.apk zip archive), no new mapping is created,
@@ -790,8 +789,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_mapFile (
 
 /** Unmap a shared file from memory.
 
-Ditto here, why do we need to mention "shared"?
-
 This function just won't work on Android in general where for
 (uncompressed) files inside the .apk, per SDK conventions in the
 /assets folder, osl_mapFile() returns a pointer to the file inside
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/conditn.h   |   35 +
 include/osl/conditn.hxx |   95 +---
 2 files changed, 84 insertions(+), 46 deletions(-)

New commits:
commit bd4aa1e09aa9fcedc381460e44bfc49a9f933786
Author: Chris Sherlock 
Date:   Sun May 28 14:52:48 2017 +1000

osl: conditin.h and conditin.hxx doxygen updates

Change-Id: Ibdfa34d2b3b93ba0b5d5211dd4f843d849375e64
Reviewed-on: https://gerrit.libreoffice.org/38100
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/include/osl/conditn.h b/include/osl/conditn.h
index 26d2cb103d62..a087f3504a49 100644
--- a/include/osl/conditn.h
+++ b/include/osl/conditn.h
@@ -32,9 +32,9 @@ extern "C" {
 typedef void* oslCondition;
 
 typedef enum {
-osl_cond_result_ok, /* successful completion */
-osl_cond_result_error,  /* error occurred, check 
osl_getLastSocketError() for details */
-osl_cond_result_timeout,/* blocking operation timed out */
+osl_cond_result_ok,  /* wait() will not block, check() returns True.
-NOTE: ALL threads waiting on this condition are unblocked!
+
+@attention @em all threads waiting on this condition are unblocked!
+
+@relates Condition
+
 @param Condition handle to a created condition.
 @retval False if system-call failed.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setCondition(oslCondition Condition);
 
 /** Sets condition to False => wait() will block, check() returns False
+
+@relates Condition
+
 @param Condition handle to a created condition.
 @retval False if system-call failed.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition);
 
-/** Blocks if condition is not set
-If condition has been destroyed prematurely, wait() will
-return with False.
+/** Blocks if condition is not set.
+
+@relates Condition
+
 @param Condition handle to a created condition.
 @param pTimeout Timeout value or NULL for infinite waiting
-@return False if system-call failed.
+@retval False Condition has been destroyed prematurely or system call has 
failed.
 */
 SAL_DLLPUBLIC oslConditionResult SAL_CALL osl_waitCondition(oslCondition 
Condition, const TimeValue* pTimeout);
 
 /** Queries the state of the condition without blocking.
+
+@relates Condition
+
 @param Condition handle to a created condition.
 @retval True condition is set
 @retval False condition is not set
diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx
index 07d697948077..ffc7cc6b5c82 100644
--- a/include/osl/conditn.hxx
+++ b/include/osl/conditn.hxx
@@ -20,12 +20,10 @@
 #ifndef INCLUDED_OSL_CONDITN_HXX
 #define INCLUDED_OSL_CONDITN_HXX
 
-#include 
-
 #include 
 
+#include 
 #include 
-
 #include 
 
 #if defined(MACOSX) && 
defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
@@ -36,63 +34,78 @@
 
 namespace osl
 {
-/**
- * A deprecated condition.
- *
- * @deprecated use C++11's std::condition_variable instead
- * for a more robust and helpful condition.
- *
- * Warning: the Condition abstraction is inadequate for any
- * situation where there may be multiple threads setting,
- * waiting, and resetting the same condition. It can only be
- * used to synchronise interactions between two threads
- * cf. lost wakeups in:
- *http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
- */
+/** Condition variable
+
+   A condition variable is essentially an object that is initially
+   cleared which a thread waits on until it is "set". It allows a
+   thread to synchronize execution by allowing other threads to wait
+   for the condition to change before that thread then continues
+   execution.
+
+   @deprecated use C++11's std::condition_variable instead
+for a more robust and helpful condition.
+
+   @attention Warning: the Condition abstraction is inadequate for
+any situation where there may be multiple threads setting,
+waiting, and resetting the same condition. It can only be
+used to synchronise interactions between two threads
+cf. lost wakeups in 
http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
+*/
 class Condition
 {
 public:
-
 enum Result
 {
-result_ok  = osl_cond_result_ok,
-result_error   = osl_cond_result_error,
-result_timeout = osl_cond_result_timeout
+result_ok  = osl_cond_result_ok,/*!< Succesful 
completion. */
+result_error   = osl_cond_result_error, /*!< Error occurred. 
@see osl_getLastSocketError() */
+result_timeout = osl_cond_result_timeout/*!< Blocking 
operation timed out. */
 };
 
-/**
- * Create a 

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.hxx |   94 +--
 1 file changed, 47 insertions(+), 47 deletions(-)

New commits:
commit 2a3e763e99207b1354ed349bcbbf439721f08c14
Author: Chris Sherlock 
Date:   Sun May 28 16:30:05 2017 +1000

osl: doxygen comment fix

Change-Id: I6c3b732bd9abe5cab44347adf0d8bc19588f31b5
Reviewed-on: https://gerrit.libreoffice.org/38101
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index b005a31b5e76..6f02301fcf3f 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -53,53 +53,53 @@ class FileBase
 public:
 
 enum RC {
-E_None = osl_File_E_None,   //< on success
-E_PERM = osl_File_E_PERM,   //< operation not permitted
-E_NOENT= osl_File_E_NOENT,  //< no such file or 
directory
-E_SRCH = osl_File_E_SRCH,   //< no process matches the 
PID
-E_INTR = osl_File_E_INTR,   //< function call was 
interrupted
-E_IO   = osl_File_E_IO, //< I/O error occured
-E_NXIO = osl_File_E_NXIO,   //< no such device or 
address
-E_2BIG = osl_File_E_2BIG,   //< argument list too long
-E_NOEXEC   = osl_File_E_NOEXEC, //< invalid executable 
file format
-E_BADF = osl_File_E_BADF,   //< bad file descriptor
-E_CHILD= osl_File_E_CHILD,  //< there are no child 
processes
-E_AGAIN= osl_File_E_AGAIN,  //< resource temp 
unavailable, try again later
-E_NOMEM= osl_File_E_NOMEM,  //< no memory available
-E_ACCES= osl_File_E_ACCES,  //< file permissions do 
not allow operation
-E_FAULT= osl_File_E_FAULT,  //< bad address; an 
invalid pointer detected
-E_BUSY = osl_File_E_BUSY,   //< resource busy
-E_EXIST= osl_File_E_EXIST,  //< file exists where 
should only be created
-E_XDEV = osl_File_E_XDEV,   //< improper link across 
file systems detected
-E_NODEV= osl_File_E_NODEV,  //< wrong device type 
specified
-E_NOTDIR   = osl_File_E_NOTDIR, //< file isn't a directory 
where one is needed
-E_ISDIR= osl_File_E_ISDIR,  //< file is a directory, 
invalid operation
-E_INVAL= osl_File_E_INVAL,  //< invalid argument to 
library function
-E_NFILE= osl_File_E_NFILE,  //< too many distinct file 
openings
-E_MFILE= osl_File_E_MFILE,  //< process has too many 
distinct files open
-E_NOTTY= osl_File_E_NOTTY,  //< inappropriate I/O 
control operation
-E_FBIG = osl_File_E_FBIG,   //< file too large
-E_NOSPC= osl_File_E_NOSPC,  //< no space left on 
device, write failed
-E_SPIPE= osl_File_E_ROFS,   //< invalid seek operation 
(such as on pipe)
-E_ROFS = osl_File_E_SPIPE,  //< illegal modification 
to read-only filesystem
-E_MLINK= osl_File_E_MLINK,  //< too many links to file
-E_PIPE = osl_File_E_PIPE,   //< broken pipe; no 
process reading from other end of pipe
-E_DOM  = osl_File_E_DOM,//< domain error 
(mathematical error)
-E_RANGE= osl_File_E_RANGE,  //< range error 
(mathematical error)
-E_DEADLK   = osl_File_E_DEADLK, //< deadlock avoided
-E_NAMETOOLONG  = osl_File_E_NAMETOOLONG,//< filename too long
-E_NOLCK= osl_File_E_NOLCK,  //< no locks available
-E_NOSYS= osl_File_E_NOSYS,  //< function not 
implemented
-E_NOTEMPTY = osl_File_E_NOTEMPTY,   //< directory not empty
-E_LOOP = osl_File_E_LOOP,   //< too many levels of 
symbolic links found during name lookup
-E_ILSEQ= osl_File_E_ILSEQ,  //< invalid or incomplete 
byte sequence of multibyte char found
-E_NOLINK   = osl_File_E_NOLINK, //< link has been severed
-E_MULTIHOP = osl_File_E_MULTIHOP,   //< remote resource is not 
directly available
-E_USERS= osl_File_E_USERS,  //< file quote system is 
confused as there are too many users
-E_OVERFLOW = osl_File_E_OVERFLOW,   //< value too large for 
defined data type
-E_NOTREADY = osl_File_E_NOTREADY,   //< device not ready
-E_invalidError = osl_File_E_invalidError,   //< unmapped error: always 
last entry in enum!
-E_TIMEDOUT = osl_File_E_TIMEDOUT,   //< socket operation timed 
out
+

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |  150 +
 1 file changed, 62 insertions(+), 88 deletions(-)

New commits:
commit 998325386625823d0368df42ac848d8cfbb5568b
Author: Chris Sherlock 
Date:   Fri May 26 01:31:37 2017 +1000

osl: file.h comments clarification and minor formatting cleanup

Change-Id: I1011665787ccec2500efc4492a9f19e53de3bf12
Reviewed-on: https://gerrit.libreoffice.org/38033
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/osl/file.h b/include/osl/file.h
index 44ce6a13dc5b..73349572063c 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -81,9 +81,7 @@ seconds (!!!).
 
 */
 
-
 /* Error codes according to errno */
-
 typedef enum {
 osl_File_E_None,/*!< on success
  */
 osl_File_E_PERM,/*!< operation not permitted   
  */
@@ -139,7 +137,6 @@ typedef enum {
 typedef void *oslDirectory;
 typedef void *oslDirectoryItem;
 
-
 /** Open a directory for enumerating its contents.
 
 @param  pustrDirectoryURL [in]
@@ -163,11 +160,9 @@ typedef void *oslDirectoryItem;
 @see osl_getNextDirectoryItem()
 @see osl_closeDirectory()
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_openDirectory(
 rtl_uString *pustrDirectoryURL, oslDirectory *pDirectory);
 
-
 /** Retrieve the next item of a previously opened directory.
 
 Retrieves the next item of a previously opened directory.
@@ -197,14 +192,12 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openDirectory(
 @see osl_getDirectoryItem()
 @see osl_getFileStatus()
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_getNextDirectoryItem(
 oslDirectory Directory,
 oslDirectoryItem *pItem,
 sal_uInt32   uHint
 );
 
-
 /** Release a directory handle.
 
 @param Directory [in]
@@ -218,11 +211,9 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_getNextDirectoryItem(
 
 @see osl_openDirectory()
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_closeDirectory(
 oslDirectory Directory);
 
-
 /** Retrieve a single directory item.
 
 Retrieves a single directory item. The returned handle has an initial 
refcount of 1.
@@ -257,13 +248,11 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_closeDirectory(
 @see osl_getFileStatus()
 @see osl_getNextDirectoryItem()
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_getDirectoryItem(
 rtl_uString *pustrFileURL,
 oslDirectoryItem *pItem
 );
 
-
 /** Increase the refcount of a directory item handle.
 
 The caller responsible for releasing the directory item handle using 
osl_releaseDirectoryItem().
@@ -279,7 +268,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getDirectoryItem(
 @see osl_getNextDirectoryItem()
 @see osl_releaseDirectoryItem()
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_acquireDirectoryItem(
 oslDirectoryItem Item );
 
@@ -301,7 +289,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_acquireDirectoryItem(
 @see osl_getNextDirectoryItem()
 @see osl_acquireDirectoryItem()
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_releaseDirectoryItem(
 oslDirectoryItem Item );
 
@@ -323,13 +310,11 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_releaseDirectoryItem(
 
 @since LibreOffice 3.6
 */
-
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem(
 oslDirectoryItem pItemA,
 oslDirectoryItem pItemB );
 
 /* File types */
-
 typedef enum {
 osl_File_Type_Directory,
 osl_File_Type_Volume,
@@ -369,16 +354,12 @@ typedef enum {
 #define osl_FileStatus_Mask_All 0x7FFF
 #define osl_FileStatus_Mask_Validate0x8000
 
-
-typedef
-
 /** Structure containing information about files and directories
 
 @seeosl_getFileStatus()
 @seeoslFileType
 */
-
-struct _oslFileStatus {
+typedef struct _oslFileStatus {
 /** Must be initialized with the size in bytes of the structure before passing 
it to any function */
 sal_uInt32  uStructSize;
 /** Determines which members of the structure contain valid data */
@@ -409,7 +390,6 @@ struct _oslFileStatus {
 rtl_uString *ustrLinkTargetURL;
 } oslFileStatus;
 
-
 /** Retrieve information about a single file or directory.
 
 @param  Item [in]
@@ -447,11 +427,9 @@ struct _oslFileStatus {
 @see osl_getNextDirectoryItem()
 @see oslFileStatus
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileStatus(
 oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask );
 
-
 typedef void *oslVolumeDeviceHandle;
 
 /** Release a volume device handle.
@@ -471,7 +449,6 @@ typedef void *oslVolumeDeviceHandle;
 @see osl_acquireVolumeDeviceHandle()
 @see osl_getVolumeInformation()
 */
-
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_releaseVolumeDeviceHandle(
 

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f347ec8f6fa7143ad98eac96051b6f4b56e71847
Author: Chris Sherlock 
Date:   Sun May 21 20:32:53 2017 +1000

osl: osl_setFilePos uHow and uPos parameter desc. are amazingly inaccurate!

Change-Id: Ie96f31b24b4f23ef72f12adee14dfe4092fc8e2b
Reviewed-on: https://gerrit.libreoffice.org/37873
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/osl/file.h b/include/osl/file.h
index fd52e30e0399..44ce6a13dc5b 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -699,13 +699,15 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFile(
 Handle to a file received by a previous call to osl_openFile().
 
 @param uHow [in]
-Distance to move the internal position pointer (from uPos).
+How to calculate the offset - osl_Pos_Absolut means start at the beginning 
of the file, osl_Pos_Current means
+offset from the current seek position and osl_Pos_End means the offset 
will be negative and the position will be
+calculated backwards from the end of the file by the offset provided.
 
 @param uPos [in]
-Absolute position from the beginning of the file.
+Seek offset, depending on uHow. If uHow is osl_Pos_End then the value must 
be negative.
 
 @retval osl_File_E_None on success
-@retval osl_File_E_INVAL the format of the parameters was not valid
+@retval osl_File_E_INVAL the format of the parameters was not valid (e.g. 
if uHow is osl_Pos_End then must be negative)
 @retval osl_File_E_OVERFLOW the resulting file offset would be a value 
which cannot be represented correctly for regular files
 
 @seeosl_openFile()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7fe9be7d273e9ec56e75f8bbd532fda1f59e98b9
Author: Chris Sherlock 
Date:   Sun May 21 01:25:55 2017 +1000

osl: include/osl/file.h typo in comment

Change-Id: I18b875e868706deaee2f50148233ec7219f89e07
Reviewed-on: https://gerrit.libreoffice.org/37863
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/include/osl/file.h b/include/osl/file.h
index 0f96cafde042..fd52e30e0399 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1379,7 +1379,7 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_getFileURLFromSystemPath(
 rtl_uString *pustrSystemPath, rtl_uString **ppustrFileURL);
 
 
-/** Searche a full qualified system path or a file URL.
+/** Search a full qualified system path or a file URL.
 
 @param pustrFileName [in]
 A system dependent path, a file URL, a file or relative directory.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.hxx |   94 +--
 1 file changed, 47 insertions(+), 47 deletions(-)

New commits:
commit a9739f2dec197793fa9400dd95be49494dc85264
Author: Chris Sherlock 
Date:   Sun May 14 18:56:19 2017 +1000

osl: document file.hxx, swap order of E_ROFS and E_SPIPE to match file.h

Change-Id: I085852e7c9fed285117f426e775f7ca2c123e4c0
Reviewed-on: https://gerrit.libreoffice.org/37594
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 3db335c2029b..a8716120e7ea 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -53,53 +53,53 @@ class FileBase
 public:
 
 enum RC {
-E_None = osl_File_E_None,
-E_PERM = osl_File_E_PERM,
-E_NOENT= osl_File_E_NOENT,
-E_SRCH = osl_File_E_SRCH,
-E_INTR = osl_File_E_INTR,
-E_IO   = osl_File_E_IO,
-E_NXIO = osl_File_E_NXIO,
-E_2BIG = osl_File_E_2BIG,
-E_NOEXEC   = osl_File_E_NOEXEC,
-E_BADF = osl_File_E_BADF,
-E_CHILD= osl_File_E_CHILD,
-E_AGAIN= osl_File_E_AGAIN,
-E_NOMEM= osl_File_E_NOMEM,
-E_ACCES= osl_File_E_ACCES,
-E_FAULT= osl_File_E_FAULT,
-E_BUSY = osl_File_E_BUSY,
-E_EXIST= osl_File_E_EXIST,
-E_XDEV = osl_File_E_XDEV,
-E_NODEV= osl_File_E_NODEV,
-E_NOTDIR   = osl_File_E_NOTDIR,
-E_ISDIR= osl_File_E_ISDIR,
-E_INVAL= osl_File_E_INVAL,
-E_NFILE= osl_File_E_NFILE,
-E_MFILE= osl_File_E_MFILE,
-E_NOTTY= osl_File_E_NOTTY,
-E_FBIG = osl_File_E_FBIG,
-E_NOSPC= osl_File_E_NOSPC,
-E_SPIPE= osl_File_E_SPIPE,
-E_ROFS = osl_File_E_ROFS,
-E_MLINK= osl_File_E_MLINK,
-E_PIPE = osl_File_E_PIPE,
-E_DOM  = osl_File_E_DOM,
-E_RANGE= osl_File_E_RANGE,
-E_DEADLK   = osl_File_E_DEADLK,
-E_NAMETOOLONG  = osl_File_E_NAMETOOLONG,
-E_NOLCK= osl_File_E_NOLCK,
-E_NOSYS= osl_File_E_NOSYS,
-E_NOTEMPTY = osl_File_E_NOTEMPTY,
-E_LOOP = osl_File_E_LOOP,
-E_ILSEQ= osl_File_E_ILSEQ,
-E_NOLINK   = osl_File_E_NOLINK,
-E_MULTIHOP = osl_File_E_MULTIHOP,
-E_USERS= osl_File_E_USERS,
-E_OVERFLOW = osl_File_E_OVERFLOW,
-E_NOTREADY = osl_File_E_NOTREADY,
-E_invalidError = osl_File_E_invalidError,   /* unmapped error: always 
last entry in enum! */
-E_TIMEDOUT = osl_File_E_TIMEDOUT,
+E_None = osl_File_E_None,   //< on success
+E_PERM = osl_File_E_PERM,   //< operation not permitted
+E_NOENT= osl_File_E_NOENT,  //< no such file or 
directory
+E_SRCH = osl_File_E_SRCH,   //< no process matches the 
PID
+E_INTR = osl_File_E_INTR,   //< function call was 
interrupted
+E_IO   = osl_File_E_IO, //< I/O error occured
+E_NXIO = osl_File_E_NXIO,   //< no such device or 
address
+E_2BIG = osl_File_E_2BIG,   //< argument list too long
+E_NOEXEC   = osl_File_E_NOEXEC, //< invalid executable 
file format
+E_BADF = osl_File_E_BADF,   //< bad file descriptor
+E_CHILD= osl_File_E_CHILD,  //< there are no child 
processes
+E_AGAIN= osl_File_E_AGAIN,  //< resource temp 
unavailable, try again later
+E_NOMEM= osl_File_E_NOMEM,  //< no memory available
+E_ACCES= osl_File_E_ACCES,  //< file permissions do 
not allow operation
+E_FAULT= osl_File_E_FAULT,  //< bad address; an 
invalid pointer detected
+E_BUSY = osl_File_E_BUSY,   //< resource busy
+E_EXIST= osl_File_E_EXIST,  //< file exists where 
should only be created
+E_XDEV = osl_File_E_XDEV,   //< improper link across 
file systems detected
+E_NODEV= osl_File_E_NODEV,  //< wrong device type 
specified
+E_NOTDIR   = osl_File_E_NOTDIR, //< file isn't a directory 
where one is needed
+E_ISDIR= osl_File_E_ISDIR,  //< file is a directory, 
invalid operation
+E_INVAL= osl_File_E_INVAL,  //< invalid argument to 
library function
+E_NFILE= osl_File_E_NFILE,  //< too many distinct file 
openings
+E_MFILE= 

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |   94 ++---
 1 file changed, 47 insertions(+), 47 deletions(-)

New commits:
commit 9b5ce4023d35c4cc82f7b17e79b8fedbcb1367dd
Author: Chris Sherlock 
Date:   Fri May 12 14:44:21 2017 +1000

osl: document oslFileError enumeration

Change-Id: I870ea69135ae293b00b9ae52f254d3f7f205a109
Reviewed-on: https://gerrit.libreoffice.org/37524
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/include/osl/file.h b/include/osl/file.h
index 3e6f392fb6ee..0f96cafde042 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -85,53 +85,53 @@ seconds (!!!).
 /* Error codes according to errno */
 
 typedef enum {
-osl_File_E_None,
-osl_File_E_PERM,
-osl_File_E_NOENT,
-osl_File_E_SRCH,
-osl_File_E_INTR,
-osl_File_E_IO,
-osl_File_E_NXIO,
-osl_File_E_2BIG,
-osl_File_E_NOEXEC,
-osl_File_E_BADF,
-osl_File_E_CHILD,
-osl_File_E_AGAIN,
-osl_File_E_NOMEM,
-osl_File_E_ACCES,
-osl_File_E_FAULT,
-osl_File_E_BUSY,
-osl_File_E_EXIST,
-osl_File_E_XDEV,
-osl_File_E_NODEV,
-osl_File_E_NOTDIR,
-osl_File_E_ISDIR,
-osl_File_E_INVAL,
-osl_File_E_NFILE,
-osl_File_E_MFILE,
-osl_File_E_NOTTY,
-osl_File_E_FBIG,
-osl_File_E_NOSPC,
-osl_File_E_SPIPE,
-osl_File_E_ROFS,
-osl_File_E_MLINK,
-osl_File_E_PIPE,
-osl_File_E_DOM,
-osl_File_E_RANGE,
-osl_File_E_DEADLK,
-osl_File_E_NAMETOOLONG,
-osl_File_E_NOLCK,
-osl_File_E_NOSYS,
-osl_File_E_NOTEMPTY,
-osl_File_E_LOOP,
-osl_File_E_ILSEQ,
-osl_File_E_NOLINK,
-osl_File_E_MULTIHOP,
-osl_File_E_USERS,
-osl_File_E_OVERFLOW,
-osl_File_E_NOTREADY,
-osl_File_E_invalidError,/* unmapped error: always last entry in 
enum! */
-osl_File_E_TIMEDOUT,
+osl_File_E_None,/*!< on success
  */
+osl_File_E_PERM,/*!< operation not permitted   
  */
+osl_File_E_NOENT,   /*!< no such file or directory 
  */
+osl_File_E_SRCH,/*!< no process matches the PID
  */
+osl_File_E_INTR,/*!< function call was interrupted 
  */
+osl_File_E_IO,  /*!< I/O error occured 
  */
+osl_File_E_NXIO,/*!< no such device or address 
  */
+osl_File_E_2BIG,/*!< argument list too long
  */
+osl_File_E_NOEXEC,  /*!< invalid executable file format
  */
+osl_File_E_BADF,/*!< bad file descriptor   
  */
+osl_File_E_CHILD,   /*!< there are no child processes  
  */
+osl_File_E_AGAIN,   /*!< resource temp unavailable, try again 
later  */
+osl_File_E_NOMEM,   /*!< no memory available   
  */
+osl_File_E_ACCES,   /*!< file permissions do not allow operation   
  */
+osl_File_E_FAULT,   /*!< bad address; an invalid pointer detected  
  */
+osl_File_E_BUSY,/*!< resource busy 
  */
+osl_File_E_EXIST,   /*!< file exists where should only be created  
  */
+osl_File_E_XDEV,/*!< improper link across file systems 
detected  */
+osl_File_E_NODEV,   /*!< wrong device type specified   
  */
+osl_File_E_NOTDIR,  /*!< file isn't a directory where one is 
needed  */
+osl_File_E_ISDIR,   /*!< file is a directory, invalid operation
  */
+osl_File_E_INVAL,   /*!< invalid argument to library function  
  */
+osl_File_E_NFILE,   /*!< too many distinct file openings   
  */
+osl_File_E_MFILE,   /*!< process has too many distinct files open  
  */
+osl_File_E_NOTTY,   /*!< inappropriate I/O control operation   
  */
+osl_File_E_FBIG,/*!< file too large
  */
+osl_File_E_NOSPC,   /*!< no space left on device, write failed 
  */
+osl_File_E_SPIPE,   /*!< invalid seek operation (such as on pipe)  
  */
+osl_File_E_ROFS,/*!< illegal modification to read-only 
filesystem*/
+osl_File_E_MLINK,   /*!< too many links to file
  */

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 81f92bc061ce0a66c9bf26047bdc6e939b68626b
Author: Chris Sherlock 
Date:   Fri May 12 13:49:18 2017 +1000

osl: file header comment clarification

Change-Id: I07aa1d2452dcdd891782707ae6928027e03f00e8
Reviewed-on: https://gerrit.libreoffice.org/37523
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/include/osl/file.h b/include/osl/file.h
index 6ef1c09a8459..3e6f392fb6ee 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -35,7 +35,8 @@ extern "C" {
 Main goals and usage hints
 
 The main intention of this interface is to provide an universal portable and
-high performance access to file system issues on any operating system.
+high performance access to file system functionality on any operating
+system.
 
 There are a few main goals:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |   76 ++---
 1 file changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 6d49392c4b23f04e70baf2b71bcc6485a966b52a
Author: Chris Sherlock 
Date:   Sun May 7 05:45:03 2017 +1000

osl: small fixes to file.h initial comment

Change-Id: I51eeed1a9afc392c33e60d5cad784136adf28384

diff --git a/include/osl/file.h b/include/osl/file.h
index 9404ffa53dbf..6ef1c09a8459 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -39,48 +39,48 @@ high performance access to file system issues on any 
operating system.
 
 There are a few main goals:
 
-1.The path specifications always has to be absolute. Any usage of relative path
-specifications is forbidden. Exceptions are osl_getSystemPathFromFileURL,
-osl_getFileURLFromSystemPath and osl_getAbsoluteFileURL. Most operating systems
-provide a "Current Directory" per process. This is the reason why relative path
-specifications can cause problems in multithreading environments.
-
-2.Proprietary notations of file paths are not supported. Every path notation
-must the file URL specification. File URLs must be encoded in UTF8 and
-after that escaped. Although the URL parameter is a unicode string, the must
-contain only ASCII characters
-
-3.The caller cannot get any information whether a file system is case 
sensitive,
-case preserving or not. The operating system implementation itself should
-determine if it can map case-insensitive paths. The case correct notation of
-a filename or file path is part of the "File Info". This case correct name
-can be used as a unique key if necessary.
-
-4. Obtaining information about files or volumes is controlled by a
-bitmask which specifies which fields are of interest. Due to performance
-issues it is not recommended to obtain information which is not needed.
-But if the operating system provides more information anyway the
-implementation can set more fields on output as were requested. It is in the
-responsibility of the caller to decide if he uses this additional information
-or not. But he should do so to prevent further unnecessary calls if the 
information
-is already there.
-
-The input bitmask supports a flag osl_FileStatus_Mask_Validate which
-can be used to force retrieving uncached validated information. Setting this 
flag
-when calling osl_getFileStatus in combination with no other flag is
-a synonym for a "FileExists". This should only be done when processing a 
single file
-(f.e. before opening) and NEVER during enumeration of directory contents on 
any step
-of information processing. This would change the runtime behaviour from O(n) to
-O(n*n/2) on nearly every file system.
-On Windows NT reading the contents of an directory with 7000 entries and
-getting full information about every file only takes 0.6 seconds. Specifying 
the
-flag osl_FileStatus_Mask_Validate for each entry will increase the
-time to 180 seconds (!!!).
+1. The path specifications always has to be absolute. Any usage of relative
+path specifications is forbidden. Exceptions are osl_getSystemPathFromFileURL,
+osl_getFileURLFromSystemPath and osl_getAbsoluteFileURL. Most operating
+systems provide a "Current Directory" per process. This is the reason why
+relative path specifications can cause problems in multithreading
+environments.
+
+2. Proprietary notations of file paths are not supported. Every path notation
+must the file URL specification. File URLs must be encoded in UTF8 and after
+that escaped. Although the URL parameter is a unicode string, the must
+contain only ASCII characters.
+
+3. The caller cannot get any information whether a file system is case
+sensitive, case preserving or not. The operating system implementation
+itself should determine if it can map case-insensitive paths. The case
+correct notation of a filename or file path is part of the "File Info". This
+case correct name can be used as a unique key if necessary.
+
+4. Obtaining information about files or volumes is controlled by a bitmask
+which specifies which fields are of interest. Due to performance reasons it
+is not recommended to obtain information which is not needed.  But if the
+operating system provides more information anyway the implementation can set
+more fields on output as were requested. It is in the responsibility of the
+caller to decide if they use this additional information or not. But they
+should do so to prevent further unnecessary calls if the information is
+already there.
+
+The input bitmask supports a flag osl_FileStatus_Mask_Validate which can be
+used to force retrieving uncached validated information. Setting this flag
+when calling osl_getFileStatus in combination with no other flag is a synonym
+for a "FileExists". This should only be done when processing a single file
+(i.e. before opening) and NEVER during enumeration of directory contents on
+any step of information processing. This would change the runtime 

[Libreoffice-commits] core.git: include/osl sal/osl

[Stephan Bergmann]

 include/osl/process.h|8 ++
 sal/osl/unx/nlsupport.cxx|   57 ---
 sal/osl/unx/nlsupport.hxx|1 
 sal/osl/unx/process_impl.cxx |   10 +--
 4 files changed, 5 insertions(+), 71 deletions(-)

New commits:
commit 6a3cfd330550ee558a546fb0808577b56ae04400
Author: Stephan Bergmann 
Date:   Wed Mar 22 13:43:20 2017 +0100

Don't actually change OS-level locale with (unused) osl_setSystemLocale

osl_setSystemLocale was introduced with 
af2938348bb539ccb27c92fe286b768d4143f662
"#88460# added osl_getProcessLocale and osl_setProcessLocale" but never 
actually
used.  So mark it as deprecated and, in the sal/osl/unx/ case, don't make it
set the OS-level locale via imp_setProcessLocale (calling setlocale or 
setting
the LC_ALL/LC_CTYPE/LANG env vars), same as in the sal/osl/w32/ case.

Change-Id: I33348dba5de8ca80ca6fca210043286c0cfa9145

diff --git a/include/osl/process.h b/include/osl/process.h
index ee7b401703fa..49fe59264059 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -396,11 +396,7 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL 
osl_getProcessWorkingDir(
 
 /** Get the locale the process is currently running in.
 
-The unix implementation caches the value it returns, so if you have to 
change the locale
-your are running in, you will have to use osl_setProcessLocale
-
 @param  ppLocale [out] a pointer that receives the currently selected 
locale structure
-@see osl_setProcessLocale
 */
 
 SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getProcessLocale(
@@ -409,7 +405,9 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getProcessLocale(
 /** Change the locale of the process.
 
 @param  pLocale [in] a pointer to the locale to be set
-@see osl_getProcessLocale
+
+@deprecated  LibreOffice itself does not use this, and client code should
+not have good use for it either.  It may eventually be removed.
 */
 
 SAL_DLLPUBLIC oslProcessError SAL_CALL osl_setProcessLocale(
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index b9cd621b8a6b..589439fffe94 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -28,7 +28,6 @@
 #if defined(LINUX) || defined(__sun) || defined(NETBSD) || \
 defined(FREEBSD) || defined(MACOSX)  || defined(IOS) || defined(OPENBSD) 
|| \
 defined(DRAGONFLY)
-#include 
 #if !defined(MACOSX) && !defined(IOS)
 #include 
 #include 
@@ -555,8 +554,6 @@ static const Pair nl_language_list[] = {
 
 #endif /* ifdef __sun LINUX FREEBSD NETBSD OPENBSD */
 
-static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-
 /*
  return the text encoding corresponding to the given locale
  */
@@ -640,29 +637,6 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
 *ppLocale = parse_locale(locale);
 }
 
-/*
- set the current process locale
- */
-
-int imp_setProcessLocale( rtl_Locale * pLocale )
-{
-char  locale_buf[64] = "";
-int   ret = 0;
-
-/* convert rtl_Locale to locale string */
-compose_locale( pLocale, locale_buf, 64 );
-
-/* basic thread safeness */
-pthread_mutex_lock(  );
-
-/* try to set LC_ALL locale */
-if( nullptr == setlocale( LC_ALL, locale_buf ) )
-ret = -1;
-
-pthread_mutex_unlock(  );
-return ret;
-}
-
 #else /* ifdef LINUX || __sun || MACOSX || NETBSD */
 
 /*
@@ -891,37 +865,6 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
 }
 #endif
 
-/*
- set the current process locale
- */
-
-static int
-imp_setenv (const char* name, const char* value)
-{
-return setenv (name, value, 1);
-}
-
-int imp_setProcessLocale( rtl_Locale * pLocale )
-{
-char locale_buf[64];
-
-/* convert rtl_Locale to locale string */
-if( nullptr != compose_locale( pLocale, locale_buf, 64 ) )
-{
-/* only change env vars that exist already */
-if( getenv( "LC_ALL" ) )
-imp_setenv( "LC_ALL", locale_buf );
-
-if( getenv( "LC_CTYPE" ) )
-imp_setenv("LC_CTYPE", locale_buf );
-
-if( getenv( "LANG" ) )
-imp_setenv( "LANG", locale_buf );
-}
-
-return 0;
-}
-
 #endif /* ifdef LINUX || __sun || MACOSX || NETBSD || AIX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx
index abcf42498fa7..53a132487c82 100644
--- a/sal/osl/unx/nlsupport.hxx
+++ b/sal/osl/unx/nlsupport.hxx
@@ -27,7 +27,6 @@
 namespace rtl { class OUString; }
 
 void imp_getProcessLocale( 

[Libreoffice-commits] core.git: include/osl vcl/inc vcl/osx

[Chris Sherlock]

 include/osl/conditn.hxx |5 +
 vcl/inc/osx/salinst.h   |4 ++--
 vcl/osx/salinst.cxx |   11 +--
 3 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 2667435ea5e6b73e58e57703b6fc3896e87eb370
Author: Chris Sherlock 
Date:   Sat Mar 18 19:58:53 2017 +1100

vcl: have AcquaSalInstance use osl::Condition instead of oslCondition

Condition is deprecated already, but there is no need for the
AcquaSalInstance class to use the low-level C-API, when in fact there
is a C++ fascade that calls on this via the C++ abstraction,
osl::Condition.

This will make it much easier to switch to using std::condition_variable
in the future.

Change-Id: Ic495c4120a59480bf50a8c5b73608874fc4228ea
Reviewed-on: https://gerrit.libreoffice.org/35392
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx
index bc96e2f4d0f5..07d697948077 100644
--- a/include/osl/conditn.hxx
+++ b/include/osl/conditn.hxx
@@ -28,6 +28,11 @@
 
 #include 
 
+#if defined(MACOSX) && 
defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+#   if __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES == 1
+#   undef check
+#   endif
+#endif
 
 namespace osl
 {
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 151fea94a4dd..6570ab32a7e2 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -24,7 +24,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 
 #ifdef MACOSX
@@ -73,7 +73,7 @@ public:
 int mnActivePrintJobs;
 std::list< SalUserEvent >   maUserEvents;
 osl::Mutex  maUserEventListMutex;
-oslConditionmaWaitingYieldCond;
+osl::Condition  maWaitingYieldCond;
 
 static std::list aAppEventList;
 
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 84cc198fcdcf..53b529e0b67e 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -349,6 +349,7 @@ void DestroySalInstance( SalInstance* pInst )
 
 AquaSalInstance::AquaSalInstance()
  : maUserEventListMutex()
+ , maWaitingYieldCond()
 {
 mpSalYieldMutex = new SalYieldMutex;
 mpSalYieldMutex->acquire();
@@ -356,7 +357,6 @@ AquaSalInstance::AquaSalInstance()
 maMainThread = osl::Thread::getCurrentIdentifier();
 mbWaitingYield = false;
 mnActivePrintJobs = 0;
-maWaitingYieldCond = osl_createCondition();
 }
 
 AquaSalInstance::~AquaSalInstance()
@@ -364,7 +364,6 @@ AquaSalInstance::~AquaSalInstance()
 ::comphelper::SolarMutex::setSolarMutex( nullptr );
 mpSalYieldMutex->release();
 delete mpSalYieldMutex;
-osl_destroyCondition( maWaitingYieldCond );
 }
 
 void AquaSalInstance::wakeupYield()
@@ -600,7 +599,7 @@ SalYieldResult AquaSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents
 if( aEvent.mpFrame && AquaSalFrame::isAlive( aEvent.mpFrame ) )
 {
 aEvent.mpFrame->CallCallback( aEvent.mnType, aEvent.mpData );
-osl_setCondition( maWaitingYieldCond );
+maWaitingYieldCond.set();
 // return if only one event is asked for
 if( ! bHandleAllCurrentEvents )
 return SalYieldResult::EVENT;
@@ -683,17 +682,17 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 (*it)->maInvalidRect.SetEmpty();
 }
 }
-osl_setCondition( maWaitingYieldCond );
+maWaitingYieldCond.set();
 }
 else if( bWait )
 {
 // #i103162#
 // wait until any thread (most likely the main thread)
 // has dispatched an event, cop out at 200 ms
-osl_resetCondition( maWaitingYieldCond );
+maWaitingYieldCond.reset();
 TimeValue aVal = { 0, 2 };
 sal_uLong nCount = ReleaseYieldMutex();
-osl_waitCondition( maWaitingYieldCond,  );
+maWaitingYieldCond.wait(  );
 AcquireYieldMutex( nCount );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sd/qa sw/source

[Julien Nabet]

 include/osl/security.h   |2 +-
 sd/qa/unit/import-tests.cxx  |8 
 sw/source/core/layout/flylay.cxx |   12 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 96a9b38db5fd9c21bffe4274fa7d5083d4bc2ee9
Author: Julien Nabet 
Date:   Sat Mar 18 19:26:14 2017 +0100

Typo: sucess->success + "adminsitrator" fix

Change-Id: I42fdb0a60b987af92e0433e7ff0e5754bc1da748
Reviewed-on: https://gerrit.libreoffice.org/35412
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/include/osl/security.h b/include/osl/security.h
index deefb5894047..03acf0a51755 100644
--- a/include/osl/security.h
+++ b/include/osl/security.h
@@ -90,7 +90,7 @@ SAL_DLLPUBLIC oslSecurityError SAL_CALL 
osl_loginUserOnFileServer(
 
 /** Query if the user who is denotes by this security has administrator rights.
 @param[in] Security the security handle for th user.
-@return True, if the user has adminsitrator rights, otherwise false.
+@return True, if the user has administrator rights, otherwise false.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isAdministrator(
 oslSecurity Security);
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 502f9f2f018d..44de6aa11393 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -916,8 +916,8 @@ void SdImportTest::testBnc591147()
 //uno::Reference< drawing::XShape > xShape(xPage->getByIndex(0), 
uno::UNO_QUERY_THROW );
 uno::Reference< beans::XPropertySet > xPropSet( getShape( 0, xPage ) );
 OUString sVideoURL("emptyURL");
-bool bSucess = xPropSet->getPropertyValue("MediaURL") >>= sVideoURL;
-CPPUNIT_ASSERT_MESSAGE( "MediaURL property is not set", bSucess );
+bool bSuccess = xPropSet->getPropertyValue("MediaURL") >>= sVideoURL;
+CPPUNIT_ASSERT_MESSAGE( "MediaURL property is not set", bSuccess );
 CPPUNIT_ASSERT_MESSAGE("MediaURL is empty", !sVideoURL.isEmpty());
 
 // Second page has audio file inserted
@@ -926,8 +926,8 @@ void SdImportTest::testBnc591147()
 
 xPropSet.set( getShape( 0, xPage ) );
 OUString sAudioURL("emptyURL");
-bSucess = xPropSet->getPropertyValue("MediaURL") >>= sAudioURL;
-CPPUNIT_ASSERT_MESSAGE( "MediaURL property is not set", bSucess );
+bSuccess = xPropSet->getPropertyValue("MediaURL") >>= sAudioURL;
+CPPUNIT_ASSERT_MESSAGE( "MediaURL property is not set", bSuccess );
 CPPUNIT_ASSERT_MESSAGE("MediaURL is empty", !sAudioURL.isEmpty());
 
 CPPUNIT_ASSERT_MESSAGE( "sAudioURL and sVideoURL should not be equal", 
sAudioURL != sVideoURL );
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 4a462ada6a14..496d6b9b9838 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -587,9 +587,9 @@ void SwPageFrame::AppendFlyToPage( SwFlyFrame *pNew )
 if ( !m_pSortedObjs )
 m_pSortedObjs = new SwSortedObjs();
 
-const bool bSucessInserted = m_pSortedObjs->Insert( *pNew );
-OSL_ENSURE( bSucessInserted, "Fly not inserted in Sorted." );
-(void) bSucessInserted;
+const bool bSuccessInserted = m_pSortedObjs->Insert( *pNew );
+OSL_ENSURE( bSuccessInserted, "Fly not inserted in Sorted." );
+(void) bSuccessInserted;
 
 // #i87493#
 OSL_ENSURE( pNew->GetPageFrame() == nullptr || pNew->GetPageFrame() == 
this,
@@ -736,9 +736,9 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove, SwPageFrame 
*pDest )
 if ( !pDest->GetSortedObjs() )
 pDest->m_pSortedObjs = new SwSortedObjs();
 
-const bool bSucessInserted = pDest->GetSortedObjs()->Insert( *pToMove );
-OSL_ENSURE( bSucessInserted, "Fly not inserted in Sorted." );
-(void) bSucessInserted;
+const bool bSuccessInserted = pDest->GetSortedObjs()->Insert( *pToMove );
+OSL_ENSURE( bSuccessInserted, "Fly not inserted in Sorted." );
+(void) bSuccessInserted;
 
 // #i28701# - use new method 
 pToMove->SetPageFrame( pDest );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/time.h |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit 11ad608a1c1128bd75c85e52995804f9864ee803
Author: Chris Sherlock 
Date:   Sat Mar 18 03:18:42 2017 +1100

osl: remove more comment cruft

Change-Id: Idbad5816dcae188705e47408fe295cbae15a29a1

diff --git a/include/osl/time.h b/include/osl/time.h
index 0a1834f4c93d..6755dba210d4 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -29,10 +29,6 @@
 #include 
 #include 
 
-//
-/* TimeValue*/
-//
-
 #ifdef SAL_W32
 #   pragma pack(push, 8)
 #endif
@@ -86,13 +82,8 @@ typedef struct {
 extern "C" {
 #endif
 
-//
-/* oslDateTime */
-//
-
 typedef struct _oslDateTime
 {
-/*--*/
 /** contains the nanoseconds .
 */
 sal_uInt32 NanoSeconds;
@@ -101,32 +92,26 @@ typedef struct _oslDateTime
 */
 sal_uInt16 Seconds;
 
-/*--*/
 /** contains the minutes (0-59).
 */
 sal_uInt16 Minutes;
 
-/*--*/
 /** contains the hour (0-23).
 */
 sal_uInt16 Hours;
 
-/*--*/
 /** is the day of month (1-31).
 */
 sal_uInt16 Day;
 
-/*--*/
 /** is the day of week (0-6 , 0 : Sunday).
 */
 sal_uInt16 DayOfWeek;
 
-/*--*/
 /** is the month of year (1-12).
 */
 sal_uInt16 Month;
 
-/*--*/
 /** is the year.
 */
 sal_Int16 Year;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.hxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit c3dfcb88c747ee1b2ca402ddbd48c82de4c316b2
Author: Chris Sherlock 
Date:   Sat Mar 18 03:16:42 2017 +1100

osl: remove commented out code

Change-Id: I106ced6554e6c64ce236b081a866decfc864026e

diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index 4213891101e1..b803be69376a 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -546,10 +546,8 @@ namespace osl
 if( pSenderAddr )
 {
 // TODO : correct the out-parameter pSenderAddr outparameter
-  nByteRead = osl_receiveFromSocket( m_handle, 
pSenderAddr->getHandle() , pBuffer,
+nByteRead = osl_receiveFromSocket( m_handle, 
pSenderAddr->getHandle() , pBuffer,
  BufferSize, Flag);
-//  nByteRead = osl_receiveFromSocket( m_handle, 
*(oslSocketAddr**)  , pBuffer,
-// BufferSize, Flag);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 195e0fc1037906a7f02d2bd15dac98e5c4535d9b
Author: Chris Sherlock 
Date:   Sat Mar 18 03:15:45 2017 +1100

osl: remove comment cruft

Change-Id: Ie3061dcacc039b7915a62daa96dc741750c56fde

diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index 190a7d7ea558..4213891101e1 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -176,7 +176,6 @@ namespace osl
 return m_handle != NULL;
 }
 
-// (static 
method)__
 inline ::rtl::OUString SAL_CALL SocketAddr::getLocalHostname( 
oslSocketResult *pResult )
 {
 ::rtl::OUString hostname;
@@ -186,14 +185,12 @@ namespace osl
 return hostname;
 }
 
-// (static 
method)__
 inline void SAL_CALL SocketAddr::resolveHostname(
 const ::rtl::OUString & strHostName, SocketAddr )
 {
 Addr = SocketAddr( osl_resolveHostname( strHostName.pData ) , 
SAL_NO_COPY );
 }
 
-// (static 
method)__
 inline sal_Int32 SAL_CALL SocketAddr::getServicePort(
 const ::rtl::OUString& strServiceName,
 const ::rtl::OUString & strProtocolName )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/security_decl.hxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e7b30d24fd22d2ada74adcb4c058ee8b14a1d189
Author: Chris Sherlock 
Date:   Sat Mar 18 03:12:05 2017 +1100

osl: I think we all know what a constructor and destructor is...

Change-Id: I67c17606b2f9d93ec047aafa1bf6adffdbad4b40

diff --git a/include/osl/security_decl.hxx b/include/osl/security_decl.hxx
index e03474e5a8a2..b011009f8c50 100644
--- a/include/osl/security_decl.hxx
+++ b/include/osl/security_decl.hxx
@@ -37,10 +37,9 @@ protected:
 oslSecurity m_handle;
 
 public:
-/// constructor
 inline Security();
-/// destructor
 inline ~Security();
+
 /** get the security information for one user.
 The underlying operating system is asked for this information.
 @param[in] strName denotes the name of the user
@@ -50,6 +49,7 @@ public:
 */
 inline bool SAL_CALL logonUser(const rtl::OUString& strName,
const rtl::OUString& strPasswd);
+
 /** get the security information for one user.
 
 @verbatim
@@ -58,6 +58,7 @@ public:
 could be connected by this user, the methos will return true and 
getHomeDir
 will return \\server\username.
 @endverbatim
+
 @param[in] strName denotes the name of the user
 @param[in] strPasswd denotes the password of this user
 @param[in] strFileServer denotes the file server to login to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/doublecheckedlocking.h |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f6e4de5a810aaa6bad75832ff21c2d52611e3543
Author: Chris Sherlock 
Date:   Sat Mar 18 03:06:23 2017 +1100

osl: add code tags to doublecheckedlocking.h

Change-Id: I4218e710a10e5f6f4b44149603beadf3390b6102

diff --git a/include/osl/doublecheckedlocking.h 
b/include/osl/doublecheckedlocking.h
index 64b07d46cd6c..8e7f4b24e0e8 100644
--- a/include/osl/doublecheckedlocking.h
+++ b/include/osl/doublecheckedlocking.h
@@ -43,6 +43,7 @@ extern "C" {
 compiler errors), though, and you should always call this macro at the
 right places then:
 
+@code{.cpp}
   static T * pInstance = 0;
 
   T * p = pInstance;
@@ -60,6 +61,7 @@ extern "C" {
   else
   OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
   return p;
+@endcode
 
 One extra advantage of this macro is that it makes it easier to find all
 places where double-checked locking is used.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/socket.h |  118 ---
 include/osl/time.h   |2 
 2 files changed, 58 insertions(+), 62 deletions(-)

New commits:
commit ece792ff5716992effdfd9db864d646e7c7ec0a6
Author: Chris Sherlock 
Date:   Sat Mar 18 02:40:23 2017 +1100

osl: more doxygen changes

Change-Id: Ic191ef5694cef24f030b8e1dba3e66d5e7fb3584

diff --git a/include/osl/socket.h b/include/osl/socket.h
index 6ee3b9b2bb68..799fa81762b9 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -212,8 +212,8 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_copySocketAddr(
 oslSocketAddr Addr);
 
 /** Compares the values of two SocketAddresses.
-@return sal_True if both addresses denote the same socket 
address,
-sal_False otherwise.
+@retval sal_True if both addresses denote the same socket address.
+@retval sal_False if both addresses do not denote the same socket address.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isEqualSocketAddr(
 oslSocketAddr Addr1, oslSocketAddr Addr2);
@@ -233,7 +233,7 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_resolveHostname(
 @seeoslSocketAddr
 @param[in]  strDottedAddr dotted decimal internet address, may be 0.
 @param[in]  Port port number in host byte order.
-@return 0 if address could not be created.
+@retval 0 if address could not be created.
 */
 SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
 rtl_uString *strDottedAddr, sal_Int32 Port);
@@ -244,7 +244,7 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL 
osl_createInetBroadcastAddr (
 (e.g. "141.99.128.50").
 @param strDottedAddr [in] String with dotted address.
 @param Port [in] portnumber in host byte order.
-@return 0 if address could not be created.
+@retval 0 if address could not be created.
 */
 SAL_DLLPUBLIC oslSocketAddr SAL_CALL osl_createInetSocketAddr (
 rtl_uString *strDottedAddr, sal_Int32 Port);
@@ -258,7 +258,7 @@ SAL_DLLPUBLIC void SAL_CALL osl_destroySocketAddr(
 
 /** Looks up the port-number designated to the specified service/protocol-pair.
 (e.g. "ftp" "tcp").
-@return OSL_INVALID_PORT if no appropriate entry was found, otherwise the 
port-number.
+@retval OSL_INVALID_PORT if no appropriate entry was found, otherwise the 
port-number.
 */
 SAL_DLLPUBLIC sal_Int32 SAL_CALL osl_getServicePort(
 rtl_uString *strServicename, rtl_uString *strProtocol);
@@ -284,7 +284,7 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL 
osl_getInetPortOfSocketAddr(
 /** Sets the Port of Addr.
 @param[in] Addr the SocketAddr to perfom the operation on.
 @param[in] Port is expected in host byte-order.
-@return sal_False if Addr is not an inet-addr.
+@retval sal_False if Addr is not an inet-addr.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setInetPortOfSocketAddr(
 oslSocketAddr Addr, sal_Int32 Port);
@@ -305,7 +305,8 @@ SAL_DLLPUBLIC oslSocketResult SAL_CALL 
osl_getHostnameOfSocketAddr(
 (e.g. 141.99.20.34) represented by the address.
 If the address is invalid or not of type 
osl_Socket_FamilyInet,
 it returns 0.
-@return osl_Socket_Ok or osl_Socket_Error
+@retval osl_Socket_Ok
+@retval osl_Socket_Error
 */
 SAL_DLLPUBLIC oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(
 oslSocketAddr Addr, rtl_uString **strDottedInetAddr);
@@ -319,7 +320,8 @@ SAL_DLLPUBLIC oslSocketResult SAL_CALL 
osl_setAddrOfSocketAddr(
 @param[in] Addr The socket address from which to extract the ipaddress.
 @param[out] ppByteSeq After the call, *ppByteSeq contains the ipaddress
  in network byteorder. *ppByteSeq may be 0 in case of an 
invalid socket handle.
-@return osl_Socket_Ok or osl_Socket_Error
+@retval osl_Socket_Ok
+@retval osl_Socket_Error
  */
 SAL_DLLPUBLIC oslSocketResult SAL_CALL osl_getAddrOfSocketAddr(
 oslSocketAddr Addr, sal_Sequence **ppByteSeq );
@@ -385,7 +387,8 @@ SAL_DLLPUBLIC oslSocketAddr SAL_CALL 
osl_getSocketAddrOfHostAddr(const oslHostAd
 /** Retrieve this machines hostname.
 May not always be a fully qualified domain name (FQDN).
 @param  strLocalHostname out-parameter. The string that receives the local 
host name.
-@return sal_True upon success, sal_False 
otherwise.
+@retval sal_True upon success
+@retval sal_False
 */
 SAL_DLLPUBLIC oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString 
**strLocalHostname);
 
@@ -416,7 +419,7 @@ SAL_DLLPUBLIC void SAL_CALL osl_releaseSocket( oslSocket 
Socket );
 
 /** Create a socket of the specified Family and Type. The semantic of
 the Protocol parameter depends on the given family and type.
-@return 0 if socket could not be created, otherwise you get a handle
+@retval 0 if socket could not be created, otherwise you get a handle
 to the allocated socket-datastructure.
 */
 SAL_DLLPUBLIC oslSocket SAL_CALL osl_createSocket(
@@ -427,7 +430,7 @@ SAL_DLLPUBLIC oslSocket 

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/file.h |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit e700d4f987ca5b3403f8a7f05089371ffb8e4243
Author: Chris Sherlock 
Date:   Sat Mar 18 01:43:11 2017 +1100

osl: remove some @return tags I missed earlier

Change-Id: I0e34fc0bc8769968a656550803edc6fdf7634ea1
Reviewed-on: https://gerrit.libreoffice.org/35342
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/include/osl/file.h b/include/osl/file.h
index e99ff3bc7d19..5773f503fc0a 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1054,7 +1054,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_syncFile( 
oslFileHandle Handle );
 @param Handle [in]
 Handle to a file received by a previous call to osl_openFile().
 
-@return
 @retval osl_File_E_None on success
 @retval osl_File_E_INVAL the format of the parameters was not valid
 @retval osl_File_E_BADF Bad file
@@ -1074,7 +1073,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_closeFile( 
oslFileHandle Handle );
 @param pustrDirectoryURL [in]
 Full qualified URL of the directory to create.
 
-@return
 @retval osl_File_E_None on success
 @retval osl_File_E_INVAL the format of the parameters was not valid
 @retval osl_File_E_NOMEM not enough memory for allocating structures
@@ -1120,7 +1118,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_createDirectoryWithFlags(
 @param pustrDirectoryURL [in]
 Full qualified URL of the directory.
 
-@return
 @retval osl_File_E_None on success
 @retval osl_File_E_INVAL the format of the parameters was not valid
 @retval osl_File_E_NOMEM not enough memory for allocating structures
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/diagnose.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cc9dddc935fcee47d391d8f914b19021a29d4c19
Author: Chris Sherlock 
Date:   Fri Mar 17 23:59:31 2017 +1100

osl: use doxygen @code special marker

Change-Id: If990a500a0794dbfce18c93a24be1d8e5703b12a
Reviewed-on: https://gerrit.libreoffice.org/35332
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index 7108a046a98a..c515eaf54827 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -148,7 +148,9 @@ private:
 /** Helper class which indicates leaking object(s) of a particular class in
 non-pro builds; use e.g.
 
+@code{.cpp}
 class MyClass : private osl::DebugBase {...};
+@endcode
 
 Using the environment variable
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Chris Sherlock]

 include/osl/conditn.h |   16 
 include/osl/diagnose.hxx  |4 
 include/osl/file.h|  720 +++---
 include/osl/file.hxx  |  679 ++-
 include/osl/module.h  |   32 -
 include/osl/module.hxx|   18 -
 include/osl/mutex.h   |6 
 include/osl/process.h |   42 --
 include/osl/profile.h |8 
 include/osl/profile.hxx   |4 
 include/osl/security_decl.hxx |   31 +
 include/osl/signal.h  |5 
 12 files changed, 706 insertions(+), 859 deletions(-)

New commits:
commit 22750c14f2850281ca5235cc3c0a6d7c8a234fe0
Author: Chris Sherlock 
Date:   Fri Mar 17 21:59:50 2017 +1100

osl: use doxygen @retval and remove HTML markup

Change-Id: Ia0d0d6b0805612a26fcb3e1cf2f7d2555f7f98f1
Reviewed-on: https://gerrit.libreoffice.org/35331
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/include/osl/conditn.h b/include/osl/conditn.h
index d0c56a33e643..6c7c166ea87d 100644
--- a/include/osl/conditn.h
+++ b/include/osl/conditn.h
@@ -32,9 +32,9 @@ extern "C" {
 typedef void* oslCondition;
 
 typedef enum {
-osl_cond_result_ok, /* successful completion */
-osl_cond_result_error,  /* error occurred, check osl_getLastSocketError() 
for details */
-osl_cond_result_timeout, /* blocking operation timed out */
+osl_cond_result_ok, /* successful completion */
+osl_cond_result_error,  /* error occurred, check 
osl_getLastSocketError() for details */
+osl_cond_result_timeout,/* blocking operation timed out */
 osl_cond_result_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
 } oslConditionResult;
 
@@ -44,7 +44,7 @@ typedef enum {
 for a more robust and helpful condition.
 
 The condition is in the reset-state.
-@returns 0 if condition could not be created.
+@retval 0 if condition could not be created.
 */
 SAL_DLLPUBLIC oslCondition SAL_CALL osl_createCondition(void);
 
@@ -56,13 +56,13 @@ SAL_DLLPUBLIC void SAL_CALL 
osl_destroyCondition(oslCondition Condition);
 /** Sets condition to True => wait() will not block, check() returns True.
 NOTE: ALL threads waiting on this condition are unblocked!
 @param Condition handle to a created condition.
-@return False if system-call failed.
+@retval False if system-call failed.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_setCondition(oslCondition Condition);
 
 /** Sets condition to False => wait() will block, check() returns False
 @param Condition handle to a created condition.
-@return False if system-call failed.
+@retval False if system-call failed.
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition);
 
@@ -77,8 +77,8 @@ SAL_DLLPUBLIC oslConditionResult SAL_CALL 
osl_waitCondition(oslCondition Conditi
 
 /** Queries the state of the condition without blocking.
 @param Condition handle to a created condition.
-@return True: condition is set. 
-False: condition is not set. 
+@retval True condition is set
+@retval False condition is not set
 */
 SAL_DLLPUBLIC sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition);
 
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index facccf929950..7108a046a98a 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -98,7 +98,7 @@ typedef ::std::unordered_set 
VoidPointerSet;
 struct ObjectRegistryData {
 ObjectRegistryData( ::std::type_info const& rTypeInfo )
 : m_pName(rTypeInfo.name()), m_nCount(0), m_addresses(),
-  
m_bStoreAddresses(osl_detail_ObjectRegistry_storeAddresses(m_pName)){}
+  m_bStoreAddresses(osl_detail_ObjectRegistry_storeAddresses(m_pName)) 
{}
 
 char const* const m_pName;
 oslInterlockedCount m_nCount;
@@ -148,9 +148,7 @@ private:
 /** Helper class which indicates leaking object(s) of a particular class in
 non-pro builds; use e.g.
 
-
 class MyClass : private osl::DebugBase {...};
-
 
 Using the environment variable
 
diff --git a/include/osl/file.h b/include/osl/file.h
index 12a0de8c9074..e99ff3bc7d19 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -35,26 +35,26 @@ extern "C" {
 Main goals and usage hints
 
 The main intentention of this interface is to provide an universal portable and
-high performance access to file system issues on any operating system.
+high performance access to file system issues on any operating system.
 
-There are a few main goals:
+There are a few main goals:
 
 1.The path specifications always has to be absolute. Any usage of relative path
-specifications is forbidden. Exceptions are 
osl_getSystemPathFromFileURL,
-osl_getFileURLFromSystemPath and 
osl_getAbsoluteFileURL. Most operating systems
+specifications is forbidden. Exceptions are osl_getSystemPathFromFileURL,
+osl_getFileURLFromSystemPath and 

[Libreoffice-commits] core.git: include/osl

[Julien Nabet]

 include/osl/socket_decl.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 797d10e1772a7c9b4c96c6da7e5dcec8e3d48914
Author: Julien Nabet 
Date:   Fri Feb 3 20:45:24 2017 +0100

Typo: amout->amount

Change-Id: Icd5a2d4156ace852f522df162c4a8da1cf2af5c2
Reviewed-on: https://gerrit.libreoffice.org/33899
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index 760096b..98eff4b 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -283,7 +283,7 @@ namespace osl
 will NOT block; false if it would block or if an 
error occurred.
 
 @param pTimeout if 0, the operation will block without a timeout. 
Otherwise
-the specified amout of time.
+the specified amount of time.
 */
 inline bool SAL_CALL isRecvReady(const TimeValue *pTimeout = NULL) 
const;
 
@@ -295,7 +295,7 @@ namespace osl
 will NOT block; false if it would block or if an 
error occurred.
 
 @param pTimeout if 0, the operation will block without a timeout. 
Otherwise
-the specified amout of time.
+the specified amount of time.
 */
 inline bool SAL_CALL isSendReady(const TimeValue *pTimeout = NULL) 
const;
 
@@ -310,7 +310,7 @@ namespace osl
 an error occurred.
 
 @param pTimeout if 0, the operation will block without a timeout. 
Otherwise
-the specified amout of time.
+the specified amount of time.
 */
 inline bool SAL_CALL isExceptionPending(const TimeValue *pTimeout = 
NULL) const;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl include/svx sc/source solenv/bin svx/source sw/source

[Takeshi Abe]

 include/osl/file.h|2 +-
 include/svx/polypolygoneditor.hxx |2 +-
 sc/source/filter/lotus/lotform.cxx|6 +++---
 solenv/bin/modules/installer/control.pm   |2 +-
 svx/source/unodraw/unoshape.cxx   |4 ++--
 sw/source/core/text/guess.hxx |2 +-
 sw/source/core/text/widorp.cxx|2 +-
 sw/source/core/view/pagepreviewlayout.cxx |4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 79497f458727a0dea983847fe9d3873bf9c2e972
Author: Takeshi Abe 
Date:   Tue Jan 24 10:26:55 2017 +0900

Fix typo in comments: absolut -> absolute

Change-Id: I8aab9004001a9a2ddd54b4c73857b6f9c5b51515
Reviewed-on: https://gerrit.libreoffice.org/33486
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/include/osl/file.h b/include/osl/file.h
index a9c9462..12a0de8 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -39,7 +39,7 @@ high performance access to file system issues on any 
operating system.
 
 There are a few main goals:
 
-1.The path specifications always has to be absolut. Any usage of relative path
+1.The path specifications always has to be absolute. Any usage of relative path
 specifications is forbidden. Exceptions are 
osl_getSystemPathFromFileURL,
 osl_getFileURLFromSystemPath and 
osl_getAbsoluteFileURL. Most operating systems
 provide a "Current Directory" per process. This is the reason why relative path
diff --git a/include/svx/polypolygoneditor.hxx 
b/include/svx/polypolygoneditor.hxx
index 7c43ca6..a65200f 100644
--- a/include/svx/polypolygoneditor.hxx
+++ b/include/svx/polypolygoneditor.hxx
@@ -51,7 +51,7 @@ public:
 */
 bool SetPointsSmooth( basegfx::B2VectorContinuity eFlags, const std::set< 
sal_uInt16 >& rAbsPoints);
 
-/** Outputs the relative position ( polygon number and point number in 
that polygon ) from the absolut point number.
+/** Outputs the relative position ( polygon number and point number in 
that polygon ) from the absolute point number.
 False is returned if the given absolute point is greater not inside 
this B2DPolyPolygon
 */
 static bool GetRelativePolyPoint( const basegfx::B2DPolyPolygon& rPoly, 
sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum );
diff --git a/sc/source/filter/lotus/lotform.cxx 
b/sc/source/filter/lotus/lotform.cxx
index 480fb32..cec80e4 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1196,7 +1196,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
 FT_Snum,//5 Short number
 FT_ConstString, //6 ASCII string
 FT_Nrref,   //7 Named range reference
-FT_Absnref, //8 Absolut named range
+FT_Absnref, //8 Absolute named range
 FT_Erref,   //9 Err range reference
 FT_Ecref,   //   10 Err cell reference
 FT_Econstant,   //   11 Err constant
@@ -1460,7 +1460,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex 
)
 ocPush, //5 Numbers
 ocPush, //6 ASCII string
 ocPush, //7 Named range reference
-ocPush, //8 Absolut named range
+ocPush, //8 Absolute named range
 ocPush, //9 Err range reference
 ocPush, //   10 Err cell reference
 ocPush, //   11 Err constant
@@ -1725,7 +1725,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
 nullptr,   //5 2-Byte integer
 nullptr,   //6 ASCII string
 nullptr,   //7 Named range reference
-nullptr,   //8 Absolut named range
+nullptr,   //8 Absolute named range
 nullptr,   //9 Err range reference
 nullptr,   //   10 Err cell reference
 nullptr,   //   11 Err constant
diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 6d95e06..7670535 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -127,7 +127,7 @@ sub check_system_path
 else
 {
 installer::logger::print_message( "\tFound: $$fileref\n" );
-# Saving the absolut path for msitran.exe. This is required for 
the determination of the checksum.
+# Saving the absolute path for msitran.exe. This is required for 
the determination of the checksum.
 if ( $onefile eq "msitran.exe" ) { 
$installer::globals::msitranpath = $$fileref; }
 }
 }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann]

 include/osl/socket.hxx  |   16 
 include/osl/socket_decl.hxx |8 
 2 files changed, 24 insertions(+)

New commits:
commit f0f600751feb5615499010c31e5a577568a88e7f
Author: Stephan Bergmann 
Date:   Tue Sep 20 11:29:40 2016 +0200

cid#1371245: Add move semantics

Change-Id: I35daf9030478831262521497a1977bdfbe661dd8

diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index b4012cc..190a7d7 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -34,6 +34,11 @@ namespace osl
 {
 }
 
+#if defined LIBO_INTERNAL_ONLY
+SocketAddr::SocketAddr(SocketAddr && other): m_handle(other.m_handle) {
+other.m_handle = nullptr;
+}
+#endif
 
 inline SocketAddr::SocketAddr(oslSocketAddr Addr)
 : m_handle( osl_copySocketAddr( Addr ) )
@@ -135,6 +140,17 @@ namespace osl
 return *this;
 }
 
+#if defined LIBO_INTERNAL_ONLY
+SocketAddr & SocketAddr::operator =(SocketAddr && other) {
+if (m_handle != nullptr) {
+osl_destroySocketAddr(m_handle);
+}
+m_handle = other.m_handle;
+other.m_handle = nullptr;
+return *this;
+}
+#endif
+
 inline SocketAddr & SAL_CALL SocketAddr::assign( oslSocketAddr Addr, 
__osl_socket_NoCopy )
 {
 if( m_handle )
diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index 1913956..760096b 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -50,6 +50,10 @@ namespace osl
  */
 inline SocketAddr(const SocketAddr& Addr);
 
+#if defined LIBO_INTERNAL_ONLY
+inline SocketAddr(SocketAddr && other);
+#endif
+
 /** The SocketAddr takes over the responsibility of the handle ( which 
means,
 that the handle gets destructed by the destructor of this 
reference)
 @param Addr a handle
@@ -119,6 +123,10 @@ namespace osl
  */
 inline SocketAddr & SAL_CALL operator= (const SocketAddr& Addr);
 
+#if defined LIBO_INTERNAL_ONLY
+inline SocketAddr & operator =(SocketAddr && other);
+#endif
+
 /** Assigns the socket addr without copyconstructing it.
 @param Addr the socket address.
 @param nocopy use SAL_NO_COPY
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann]

 include/osl/pipe.hxx  |   15 +++
 include/osl/pipe_decl.hxx |8 
 2 files changed, 23 insertions(+)

New commits:
commit 9dbb9f9a07d43841473770e9d8c4d4f1f5ffba9a
Author: Stephan Bergmann 
Date:   Tue Sep 20 11:28:06 2016 +0200

cid#1371291: Add move semantics

Change-Id: I9bca3413e023b6909fbf75e567ed75739189bc43

diff --git a/include/osl/pipe.hxx b/include/osl/pipe.hxx
index 04a971b..743dec3 100644
--- a/include/osl/pipe.hxx
+++ b/include/osl/pipe.hxx
@@ -50,6 +50,11 @@ namespace osl
 osl_acquirePipe( m_handle );
 }
 
+#if defined LIBO_INTERNAL_ONLY
+Pipe::Pipe(Pipe && other): m_handle(other.m_handle) {
+other.m_handle = nullptr;
+}
+#endif
 
 inline Pipe::Pipe( oslPipe pipe, __sal_NoAcquire )
 : m_handle ( pipe )
@@ -91,6 +96,16 @@ namespace osl
 return *this;
 }
 
+#if defined LIBO_INTERNAL_ONLY
+Pipe & Pipe::operator =(Pipe && other) {
+if (m_handle != nullptr) {
+osl_releasePipe(m_handle);
+}
+m_handle = other.m_handle;
+other.m_handle = nullptr;
+return *this;
+}
+#endif
 
 inline Pipe & SAL_CALL Pipe::operator=( oslPipe pipe)
 {
diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx
index 0c0430e..7383324 100644
--- a/include/osl/pipe_decl.hxx
+++ b/include/osl/pipe_decl.hxx
@@ -58,6 +58,10 @@ public:
 */
 inline Pipe(const Pipe& pipe);
 
+#if defined LIBO_INTERNAL_ONLY
+inline Pipe(Pipe && other);
+#endif
+
 /** Constructs a Pipe reference without acquiring the handle
 */
 inline Pipe( oslPipe pipe, __sal_NoAcquire noacquire );
@@ -103,6 +107,10 @@ public:
 */
 inline Pipe& SAL_CALL operator= (const Pipe& pipe);
 
+#if defined LIBO_INTERNAL_ONLY
+inline Pipe & operator =(Pipe && other);
+#endif
+
 /** Assignment operator. If pipe was already created, the old one will
 be discarded.
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann]

 include/osl/endian.h |  134 +++
 1 file changed, 29 insertions(+), 105 deletions(-)

New commits:
commit 473472ea3c5e38395a35195f728f5b6ed449318b
Author: Stephan Bergmann 
Date:   Tue Apr 12 20:33:18 2016 +0200

Skip intermediate _LITTLE/BIG_ENDIAN when determining OSL_LIT/BIGENDIAN

Change-Id: I1e3247a15eef62455e48229732418e7c824bb0b4
Reviewed-on: https://gerrit.libreoffice.org/24036
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/osl/endian.h b/include/osl/endian.h
index 4043c40..ebc4854 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -26,132 +26,56 @@
 extern "C" {
 #endif
 
-/** Determine the platform byte order as _BIG_ENDIAN, _LITTLE_ENDIAN, ...
+/** Define the platform byte order as OSL_BIGENDIAN or OSL_LITENDIAN.
  */
-#ifdef _WIN32
-#   if defined(_M_IX86)
-#   define _LITTLE_ENDIAN
-#   elif defined(_M_AMD64)
-#   define _LITTLE_ENDIAN
-#   elif defined(_M_MRX000)
-#   define _LITTLE_ENDIAN
-#   elif defined(_M_ALPHA)
-#   define _LITTLE_ENDIAN
-#   elif defined(_M_PPC)
-#   define _LITTLE_ENDIAN
-#   endif
-#endif
 
-#ifdef LINUX
-#   include 
-#   if __BYTE_ORDER == __LITTLE_ENDIAN
-#   ifndef _LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
-#   endif
-#   elif __BYTE_ORDER == __BIG_ENDIAN
-#   ifndef _BIG_ENDIAN
-#   define _BIG_ENDIAN
-#   endif
+#if defined _WIN32
+#   if defined _M_ALPHA || defined _M_AMD64 || defined _M_IX86 \
+|| defined _M_MRX000 || defined _M_PPC
+#   define OSL_LITENDIAN
 #   endif
-#endif
-
-#ifdef ANDROID
+#elif defined ANDROID || defined LINUX
 #   include 
 #   if __BYTE_ORDER == __LITTLE_ENDIAN
-#   ifndef _LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
-#   endif
+#   define OSL_LITENDIAN
 #   elif __BYTE_ORDER == __BIG_ENDIAN
-#   ifndef _BIG_ENDIAN
-#   define _BIG_ENDIAN
-#   endif
-#   endif
-#endif
-
-#ifdef EMSCRIPTEN
-#   include 
-#   ifndef _LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
+#   define OSL_BIGENDIAN
 #   endif
-#endif
-
-#ifdef NETBSD
+#elif defined EMSCRIPTEN
+#   define OSL_LITENDIAN
+#elif defined IOS || defined MACOSX || defined NETBSD
 #   include 
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#   undef _BIG_ENDIAN
+#   define OSL_LITENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#   undef _LITTLE_ENDIAN
+#   define OSL_BIGENDIAN
 #   endif
-#endif
-
-#ifdef FREEBSD
+#elif defined FREEBSD
 #   include 
 #   include 
-#endif
-
-#ifdef AIX
+#   if defined _LITTLE_ENDIAN
+#   define OSL_LITENDIAN
+#   elif defined _BIG_ENDIAN
+#   define OSL_BIGENDIAN
+#   endif
+#elif defined AIX
 #   include 
 #   if BYTE_ORDER == LITTLE_ENDIAN
-#   ifndef _LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
-#   endif
+#   define OSL_LITENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
-#   ifndef _BIG_ENDIAN
-#   define _BIG_ENDIAN
-#   endif
+#   define OSL_BIGENDIAN
 #   endif
-#endif
-
-#ifdef SOLARIS
+#elif defined SOLARIS
 #   include 
-#endif
-
-#ifdef MACOSX
-#   include 
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   ifndef _LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
-#   endif
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   ifndef _BIG_ENDIAN
-#   define _BIG_ENDIAN
-#   endif
-#   endif
-#endif
-
-#ifdef IOS
-#   include 
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   ifndef _LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
-#   endif
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   ifndef _BIG_ENDIAN
-#   define _BIG_ENDIAN
-#   endif
+#   if defined _LITTLE_ENDIAN
+#   define OSL_LITENDIAN
+#   elif defined _BIG_ENDIAN
+#   define OSL_BIGENDIAN
 #   endif
-#endif
-
-/** Check supported platform.
- */
-#if !defined(_WIN32)  && \
-!defined(LINUX)   && !defined(NETBSD) && \
-!defined(AIX) && !defined(OPENBSD) && \
-!defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \
-!defined(DRAGONFLY) && \
-!defined(IOS) && !defined(ANDROID) && \
-!defined(EMSCRIPTEN)
+#else
 #   error "Target platform not specified !"
 #endif
-
-
-/** Define the determined byte order as OSL_BIGENDIAN or OSL_LITENDIAN.
- */
-#if defined _LITTLE_ENDIAN
-#   define OSL_LITENDIAN
-#elif defined _BIG_ENDIAN
-#   define OSL_BIGENDIAN
-#else
+#if defined OSL_LITENDIAN == defined OSL_BIGENDIAN
 #   error undetermined endianness
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Tor Lillqvist]

 include/osl/thread.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ad777d0f07d519f409b056ecdafec623e7edd926
Author: Tor Lillqvist 
Date:   Wed Mar 30 07:58:02 2016 +0300

Improve wording

Change-Id: If6d0e38070cd99de903639944ecc8db16c653302

diff --git a/include/osl/thread.h b/include/osl/thread.h
index 0a8eb4c..be7999e 100644
--- a/include/osl/thread.h
+++ b/include/osl/thread.h
@@ -124,8 +124,8 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL osl_isThreadRunning(const 
oslThread Thread);
 */
 SAL_DLLPUBLIC void SAL_CALL osl_joinWithThread(oslThread Thread);
 
-/** Blocks the calling thread at least for the given number
-of time.
+/** Suspends the execution of the calling thread for at least the given
+time.
 */
 SAL_DLLPUBLIC void SAL_CALL osl_waitThread(const TimeValue* pDelay);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Noel Grandin]

 include/osl/interlck.h |8 
 1 file changed, 8 insertions(+)

New commits:
commit e82ca698ecdf7f73f6d0bf2974c19beade0f09cc
Author: Noel Grandin 
Date:   Tue Dec 1 07:58:12 2015 +0200

use compiler intrinsic for osl_atomic_increment on Windows

Change-Id: I66b2ba5d8e419f6af5eb3f85f8c12effcdaf4d5e
Reviewed-on: https://gerrit.libreoffice.org/20319
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index 925e5f2..85da298 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -25,6 +25,10 @@
 #include 
 #include 
 
+#if defined WNT
+#include 
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -58,6 +62,8 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInte
 */
 #if HAVE_GCC_BUILTIN_ATOMIC
 #define osl_atomic_increment(p)  __sync_add_and_fetch((p), 1)
+#elif defined WNT
+#define osl_atomic_increment(p)  _InterlockedIncrement(p)
 #else
 #define osl_atomic_increment(p) osl_incrementInterlockedCount((p))
 #endif
@@ -75,6 +81,8 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInte
 */
 #if HAVE_GCC_BUILTIN_ATOMIC
 #define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1)
+#elif defined WNT
+#define osl_atomic_decrement(p)  _InterlockedDecrement(p)
 #else
 #define osl_atomic_decrement(p) osl_decrementInterlockedCount((p))
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Matteo Casalin]

 include/osl/endian.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6484b2fda3b4fa0059526e81cd1e26cca46cb705
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Tue Jul 21 22:56:56 2015 +0200

endian.h: avoid some Wconversion warnings

Change-Id: Ic77bd0dd6ac2355eaf3e11811fba7604c782d9d6
Reviewed-on: https://gerrit.libreoffice.org/17307
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/include/osl/endian.h b/include/osl/endian.h
index 0819dee..5305493 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -161,7 +161,7 @@ extern C {
 #endif
 
 #ifndef OSL_MAKEWORD
-#   define OSL_MAKEWORD(bl, bh)((sal_uInt16)((bl)  0xFF) | 
(((sal_uInt16)(bh)  0xFF)  8))
+#   define OSL_MAKEWORD(bl, bh)((sal_uInt16)((sal_uInt16)((bl)  0xFF) | 
(((sal_uInt16)(bh)  0xFF)  8)))
 #endif
 #ifndef OSL_LOBYTE
 #   define OSL_LOBYTE(w)   ((sal_uInt8)((sal_uInt16)(w)  0xFF))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Tor Lillqvist]

 include/osl/process.h |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 23a0fe78733e6e2598f9267af0da6bf9767c3f73
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Jul 15 14:51:22 2015 +0300

Clarify documentation of (mis)features of osl_getExecutableFile()

Change-Id: I106b14a8ce2709c11f23eb1d49924c9c5ab51b50

diff --git a/include/osl/process.h b/include/osl/process.h
index ca30046..f1fec50 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -335,6 +335,12 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getProcessInfo(
 @param strFile [out] the string that receives the executable file path.
 @return osl_Process_E_None or does not return.
 @see osl_executeProcess
+
+Ideally this will return the true executable file path as a file:
+URL, but actually in case something else happens to have been
+passed as argv[0] to osl_setCommandArgs(), it will return that
+either as a file URL, or as such in case it doesn't look like an
+absolute pathname.
 */
 SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getExecutableFile(
 rtl_uString **strFile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann]

 include/osl/detail/component-defines.h |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit fe6b4cf280dc851e2cc8c1d7023fc3f5b85f6a88
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jan 8 12:37:24 2015 +0100

osl/detail/component-defines.h is used in cppumaker-generated code

see ServiceType::dumpHxxFile and SingletonType::dumpHxxFile in
codemaker/source/cppumaker/cpputype.cxx

partial revert of 45ec1d9b56cec41596f806ebf845ebfcd30c9f46 brute-force
find-and-remove of unused #define constants.

Change-Id: I3c3d10f2d81926ad0b86330d46b8bf52416bc361

diff --git a/include/osl/detail/component-defines.h 
b/include/osl/detail/component-defines.h
index bb51035..9a31cee 100644
--- a/include/osl/detail/component-defines.h
+++ b/include/osl/detail/component-defines.h
@@ -17,6 +17,31 @@
 
 #define LO_URE_CURRENT_ENV 1 /*TODO*/
 
+// sax/source/expatwrap/expwrap.component
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 
com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 1 
/*TODO*/
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 
com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation
+// sfx2/util/sfx.component
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_document_dot_DocumentProperties 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_document_dot_DocumentProperties 
SfxDocumentMetaData_get_implementation
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_OfficeFrameLoader 1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_OfficeFrameLoader 
com_sun_star_comp_office_FrameLoader_get_implementation
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_SynchronousFrameLoader 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_SynchronousFrameLoader  
com_sun_star_comp_office_FrameLoader_get_implementation
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_DocumentTemplates 1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_DocumentTemplates 
com_sun_star_comp_sfx2_DocumentTemplates_get_implementation
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_GlobalEventBroadcaster 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_GlobalEventBroadcaster 
com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation
+#define 
LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_frame_dot_theGlobalEventBroadcaster 1
+#define 
LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_frame_dot_theGlobalEventBroadcaster 
com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation
+// svtools/util/svt_dot_component
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_graphic_dot_GraphicProvider 1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_graphic_dot_GraphicProvider 
com_sun_star_comp_graphic_GraphicProvider_get_implementation
+// svx/util/svx_dot_component
+#define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_drawing_dot_CustomShapeEngine 
1
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_drawing_dot_CustomShapeEngine 
com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann]

 include/osl/file.h |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 344ad69a0427d5f5daa0bebaad3466773c52a312
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Oct 31 10:10:33 2014 +0100

Duplicate line

Change-Id: I55811305ec24ff3538d33e98c8eac680e7da17fe

diff --git a/include/osl/file.h b/include/osl/file.h
index 1f1ae1b..e2167db 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1166,7 +1166,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL 
osl_createDirectoryWithFlags(
 osl_File_E_BUSY device or resource busybr
 osl_File_E_ROFS read-only file systembr
 osl_File_E_LOOP too many symbolic links encounteredbr
-osl_File_E_BUSY device or resource busybr
 osl_File_E_EXIST file existsbr
 osl_File_E_IO on I/O errorsbr
 osl_File_E_MULTIHOP multihop attemptedbr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl

[Stephan Bergmann]

 include/osl/file.h|6 +-
 sal/osl/unx/file_misc.cxx |   21 ++---
 2 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 6edbcc1b231feb02f304ff646c323b5df051d9a4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Oct 31 12:05:25 2014 +0100

cid#1242936 handle rename failure

Change-Id: I92ce690a6f8183ce77c8ed53bd2fcb45d39d756e

diff --git a/include/osl/file.h b/include/osl/file.h
index e2167db..a9c9462 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1309,7 +1309,9 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_removeFile(
 osl_File_E_NAMETOOLONG file name too longbr
 osl_File_E_NOENT no such file or directorybr
 osl_File_E_ISDIR is a directorybr
-osl_File_E_ROFS read-only file systemp
+osl_File_E_ROFS read-only file systembr
+osl_File_E_BUSY if the implementation internally requires resources that 
are
+(temporarily) unavailable (added with LibreOffice 4.4)
 
 @seeosl_moveFile()
 @seeosl_removeFile()
@@ -1339,6 +1341,8 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_copyFile(
 osl_File_E_NAMETOOLONG file name too longbr
 osl_File_E_NOENT no such file or directorybr
 osl_File_E_ROFS read-only file systembr
+osl_File_E_BUSY if the implementation internally requires resources that 
are
+(temporarily) unavailable (added with LibreOffice 4.4)
 
 @see osl_copyFile()
 */
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index eb1e151..5386e4e 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -810,6 +810,8 @@ static oslFileError oslDoCopy(const sal_Char* 
pszSourceFileName, const sal_Char*
 
 if ( DestFileExists )
 {
+//TODO: better pick a temp file name instead of adding .osl-tmp:
+
 strncpy(pszTmpDestFile, pszDestFileName, size_tmp_dest_buff - 1);
 
 if ((strlen(pszTmpDestFile) + strlen(TMP_DEST_FILE_EXTENSION)) = 
size_tmp_dest_buff)
@@ -817,9 +819,22 @@ static oslFileError oslDoCopy(const sal_Char* 
pszSourceFileName, const sal_Char*
 
 strncat(pszTmpDestFile, TMP_DEST_FILE_EXTENSION, 
strlen(TMP_DEST_FILE_EXTENSION));
 
-/* FIXME: what if pszTmpDestFile already exists? */
-/*with getcanonical??? */
-nRet=rename(pszDestFileName,pszTmpDestFile);
+if (rename(pszDestFileName,pszTmpDestFile) != 0)
+{
+if (errno == ENOENT)
+{
+DestFileExists = 0;
+}
+else
+{
+int e = errno;
+SAL_INFO(
+sal.osl,
+rename(  pszDestFileName  ,   pszTmpDestFile
+ ) failed with errno   e);
+return osl_File_E_BUSY; // for want of a better error code
+}
+}
 }
 
 /* mfe: should be S_ISREG */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl

[Riccardo Magliocchetti]

 include/osl/endian.h |7 ---
 sal/osl/unx/socket.c |2 +-
 sal/osl/unx/system.h |   13 ++---
 3 files changed, 3 insertions(+), 19 deletions(-)

New commits:
commit b471943640f51e252046e2c91a7cb00d72f8d07c
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date:   Fri Aug 8 14:47:59 2014 +0200

osl: kill check for ancient freebsd  7 versions

Change-Id: I082611edd88daae36181d62f9fc56b588630629b
Reviewed-on: https://gerrit.libreoffice.org/10828
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/include/osl/endian.h b/include/osl/endian.h
index 30fa42b..0819dee 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -80,13 +80,6 @@ extern C {
 #ifdef FREEBSD
 #   include sys/param.h
 #   include machine/endian.h
-#if __FreeBSD_version  50
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   define _BIG_ENDIAN
-#   endif
-#endif
 #endif
 
 #ifdef AIX
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index d28413b..602135e 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -728,7 +728,7 @@ static struct hostent* _osl_gethostbyname_r (
 const char *name, struct hostent *result,
 char *buffer, int buflen, int *h_errnop)
 {
-#if defined(LINUX) || defined(ANDROID) || (defined(FREEBSD)  
(__FreeBSD_version = 601103)) || defined(DRAGONFLY)
+#if defined(LINUX) || defined(ANDROID) || (defined(FREEBSD) || 
defined(DRAGONFLY)
 struct hostent *__result; /* will be the same as result */
 int __error;
 __error = gethostbyname_r (name, result, buffer, buflen,
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 33aef24..d952518 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -131,13 +131,6 @@
 #   include netinet/tcp.h
 #   define  IORESOURCE_TRANSFER_BSD
 #   include machine/endian.h
-#if __FreeBSD_version  50
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   define _BIG_ENDIAN
-#   endif
-#endif
 #   define  NO_PTHREAD_RTL
 #endif
 
@@ -395,7 +388,7 @@ typedef struct sockaddr_ipx {
 /* END HACK */
 
 #ifdef NO_PTHREAD_RTL
-#if !defined FREEBSD || (__FreeBSD_version  500112)
+#if !defined FREEBSD
 #if !defined NETBSD
 struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);
 #endif
@@ -406,11 +399,9 @@ extern struct spwd *getspnam_r(const char *name, struct 
spwd *result,
 struct tm *localtime_r(const time_t *timep, struct tm *buffer);
 struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
 #endif
-#endif /* !defined FREEBSD || (__FreeBSD_version  500112) */
-#if !defined(FREEBSD) || (__FreeBSD_version  601103)
 struct hostent *gethostbyname_r(const char *name, struct hostent *result,
 char *buffer, size_t buflen, int *h_errnop);
-#endif /* !defined(FREEBSD) || (__FreeBSD_version  601103) */
+#endif /* !defined(FREEBSD) */
 #endif
 
 #endif // INCLUDED_SAL_OSL_UNX_SYSTEM_H
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl sal/util

[Andrzej Hunt]

 include/osl/process.h|5 +
 sal/osl/unx/process_impl.cxx |5 +
 sal/osl/w32/process.cxx  |6 ++
 sal/util/sal.map |1 +
 4 files changed, 17 insertions(+)

New commits:
commit 7fd7b7af26952676d8fcff6b56a081aac681d804
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Thu Jul 10 12:17:05 2014 +0200

Introduce osl_areCommandArgsSet.

We cannot call osl_setCommandArgs twice, however there is currently
no way to determine whether or not this has already been done. This is
necessary e.g. for LibreOfficeKit where we may also be using UNO
separately (and also for unit tests where LO is already set-up prior
to the unit test running, and therefore we can't set up osl again
from within LOK).

Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb

diff --git a/include/osl/process.h b/include/osl/process.h
index 7d0960e..7fb619f 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -366,6 +366,11 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL 
osl_getCommandArgCount(void);
 SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getCommandArg(
 sal_uInt32 nArg, rtl_uString **strCommandArg);
 
+/** Determine whether or not the command args have already been set.
+@return The command args are already set, and may not be set again.
+*/
+SAL_DLLPUBLIC int SAL_CALL osl_areCommandArgsSet (void);
+
 /** Set the command-line arguments as passed to the main-function of this 
process.
 
 Deprecated: This function is only for internal use. Passing the args from 
main will
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index d28f46d..b63f222 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -191,6 +191,11 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 
nArg, rtl_uString ** strC
 return (result);
 }
 
+int SAL_CALL osl_areCommandArgsSet (void)
+{
+return (g_command_args.m_nCount  0);
+}
+
 /***
  osl_setCommandArgs().
  **/
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 3dd0e77..25f4e58 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -374,6 +374,12 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32 
nArg, rtl_uString **strCo
 
 /***/
 
+int SAL_CALL osl_areCommandArgsSet(void)
+{
+return (g_command_args.m_nCount  0);
+}
+
+
 void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
 {
 osl_acquireMutex (*osl_getGlobalMutex());
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 1d7d491..6acd9c4 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -675,6 +675,7 @@ LIBO_UDK_4.3 { # symbols available in = LibO 4.3
 osl_createDirectoryWithFlags;
 rtl_allocateAlignedMemory;
 rtl_freeAlignedMemory;
+osl_areCommandArgsSet;
 } LIBO_UDK_4.2;
 
 PRIVATE_1.0 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl sal/util unotools/source

[Stephan Bergmann]

 include/osl/file.h |   16 
 include/osl/file.hxx   |   11 +--
 sal/osl/unx/file_misc.cxx  |   26 ++
 sal/osl/w32/file_dirvol.cxx|6 ++
 sal/util/sal.map   |1 +
 unotools/source/ucbhelper/tempfile.cxx |5 -
 6 files changed, 58 insertions(+), 7 deletions(-)

New commits:
commit f65de4feee506b80be0986ce28f7a2311e4fbe2c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 20 18:07:54 2014 +0200

fdo#60338: Introduce osl_createDirectoryWithFlags

...so that utl::TempFile can pass osl_File_OpenFlag_Private and doesn't 
have to
resort to umask (the calls to umask around Directory::create had somewhat
erroneously been removed recently with 
1d72a0262c4570631d0aa8f98e34e21fb9d6ae42
Related fdo#60338: Create missing temp file dir with user's original 
umask,
mistaking this for creation of intermediate directories in the hierarchy).

On Windows, the flags argument to osl_createDirectoryWithFlags is ignored
completely for now.

Change-Id: Iac56a5049d579be729a3f338aa62105123edb6cb

diff --git a/include/osl/file.h b/include/osl/file.h
index c00a302..1f1ae1b 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -1130,6 +1130,22 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_closeFile( 
oslFileHandle Handle );
 
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_createDirectory( rtl_uString* 
pustrDirectoryURL );
 
+/** Create a directory, passing flags.
+
+@param url
+File URL of the directory to create.
+
+@param flags
+A combination of the same osl_File_OpenFlag_*s used by osl_openFile,
+except that osl_File_OpenFlag_Create is implied and ignored.  Support for
+the various flags can differ across operating systems.
+
+@see osl_createDirectory()
+
+@since LibreOffice 4.3
+*/
+SAL_DLLPUBLIC oslFileError SAL_CALL osl_createDirectoryWithFlags(
+rtl_uString * url, sal_uInt32 flags);
 
 /** Remove an empty directory.
 
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 1e600e7..8f7f3b4 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -1849,6 +1849,10 @@ public:
 @param ustrDirectoryURL [in]
 Full qualified URL of the directory to create.
 
+@param flags [in]
+Optional flags, see osl_createDirectoryWithFlags for details.  This
+defaulted parameter is new since LibreOffice 4.3.
+
 @return
 E_None on success
 E_INVAL the format of the parameters was not valid
@@ -1871,9 +1875,12 @@ public:
 @see remove()
 */
 
-inline static RC create( const ::rtl::OUString ustrDirectoryURL )
+inline static RC create(
+const ::rtl::OUString ustrDirectoryURL,
+sal_Int32 flags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write )
 {
-return static_cast RC ( osl_createDirectory( ustrDirectoryURL.pData 
) );
+return static_cast RC (
+osl_createDirectoryWithFlags( ustrDirectoryURL.pData, flags ) );
 }
 
 /** Remove an empty directory.
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 787866e..eb1e151 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -131,7 +131,8 @@ oslFileType DirectoryItem_Impl::getFileType() const
 return osl_File_Type_Unknown;
 }
 
-static oslFileError osl_psz_createDirectory(const sal_Char* pszPath);
+static oslFileError osl_psz_createDirectory(
+char const * pszPath, sal_uInt32 flags);
 static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath);
 
 oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, 
oslDirectory* pDirectory)
@@ -395,6 +396,13 @@ oslFileError SAL_CALL osl_releaseDirectoryItem( 
oslDirectoryItem Item )
 
 oslFileError SAL_CALL osl_createDirectory( rtl_uString* ustrDirectoryURL )
 {
+return osl_createDirectoryWithFlags(
+ustrDirectoryURL, osl_File_OpenFlag_Read | osl_File_OpenFlag_Write);
+}
+
+oslFileError osl_createDirectoryWithFlags(
+rtl_uString * ustrDirectoryURL, sal_uInt32 flags)
+{
 char path[PATH_MAX];
 oslFileError eRet;
 
@@ -410,7 +418,7 @@ oslFileError SAL_CALL osl_createDirectory( rtl_uString* 
ustrDirectoryURL )
   return oslTranslateFileError( OSL_FET_ERROR, errno );
 #endif/* MACOSX */
 
-return osl_psz_createDirectory( path );
+return osl_psz_createDirectory( path, flags );
 }
 
 oslFileError SAL_CALL osl_removeDirectory( rtl_uString* ustrDirectoryURL )
@@ -433,10 +441,20 @@ oslFileError SAL_CALL osl_removeDirectory( rtl_uString* 
ustrDirectoryURL )
 return osl_psz_removeDirectory( path );
 }
 
-static oslFileError osl_psz_createDirectory( const sal_Char* pszPath )
+oslFileError osl_psz_createDirectory(char const * pszPath, sal_uInt32 flags)
 {
 int nRet=0;
-int mode = S_IRWXU | S_IRWXG | S_IRWXO;
+int mode
+= (((flags  osl_File_OpenFlag_Read) == 0
+

[Libreoffice-commits] core.git: include/osl sal/osl unotools/source

[Stephan Bergmann]

 include/osl/detail/file.h  |3 ++-
 sal/osl/unx/file.cxx   |9 ++---
 unotools/source/ucbhelper/tempfile.cxx |   12 
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit f67702e709a9049042fdd456d2456d35055a935d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon May 19 11:44:24 2014 +0200

fdo#60338: Add osl_File_OpenFlag_Private to avoid umask

Change-Id: I293295244d1b089d747548c5025cb73b8ec428a4

diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index 96d8807..ee5a172 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -19,10 +19,11 @@
  */
 
 /* More flags needed for semantics that match the open() call that
-   used to be in SvFileStream::Open().
+   used to be in SvFileStream::Open(), and for temp files:
 */
 #define osl_File_OpenFlag_Trunc 0x0010L
 #define osl_File_OpenFlag_NoExcl0x0020L
+#define osl_File_OpenFlag_Private   0x0040L
 
 /** @endcond */
 
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index e781574..a7eaac1 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -853,16 +853,19 @@ openFilePath( const char *cpFilePath, oslFileHandle* 
pHandle, sal_uInt32 uFlags,
 #endif
 
 /* set mode and flags */
-int defmode  = S_IRUSR | S_IRGRP | S_IROTH;
+int defmode = uFlags  osl_File_OpenFlag_Private
+? S_IRUSR : S_IRUSR | S_IRGRP | S_IROTH;
 int flags = O_RDONLY;
 if (uFlags  osl_File_OpenFlag_Write)
 {
-defmode |= S_IWUSR | S_IWGRP | S_IWOTH;
+defmode |= uFlags  osl_File_OpenFlag_Private
+? S_IWUSR : S_IWUSR | S_IWGRP | S_IWOTH;
 flags = OPEN_WRITE_FLAGS;
 }
 if (uFlags  osl_File_OpenFlag_Create)
 {
-defmode |= S_IWUSR | S_IWGRP | S_IWOTH;
+defmode |= uFlags  osl_File_OpenFlag_Private
+? S_IWUSR : S_IWUSR | S_IWGRP | S_IWOTH;
 flags = OPEN_CREATE_FLAGS;
 }
 if (mode == mode_t(-1))
diff --git a/unotools/source/ucbhelper/tempfile.cxx 
b/unotools/source/ucbhelper/tempfile.cxx
index 8d4152c..5b9cae7 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -29,6 +29,7 @@
 #include ucbhelper/fileidentifierconverter.hxx
 #include rtl/ustring.hxx
 #include rtl/instance.hxx
+#include osl/detail/file.h
 #include osl/file.hxx
 #include tools/time.hxx
 #include tools/debug.hxx
@@ -258,14 +259,9 @@ OUString lcl_createName(
 {
 DBG_ASSERT( bKeep, Too expensive, use directory for creating 
name! );
 File aFile( aTmp );
-#ifdef UNX
-/* RW permission for the user only! */
-mode_t old_mode = umask(077);
-#endif
-FileBase::RC err = aFile.open(osl_File_OpenFlag_Create | (bLock ? 
0 : osl_File_OpenFlag_NoLock));
-#ifdef UNX
-umask(old_mode);
-#endif
+FileBase::RC err = aFile.open(
+osl_File_OpenFlag_Create | osl_File_OpenFlag_Private
+| (bLock ? 0 : osl_File_OpenFlag_NoLock));
 if ( err == FileBase::E_None || (bLock  err == 
FileBase::E_NOLCK) )
 {
 aFile.close();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl sal/qa sal/util

[Stephan Bergmann]

 include/osl/detail/file.h|3 ---
 sal/osl/unx/file.cxx |   12 +---
 sal/qa/osl/file/osl_File.cxx |   29 -
 sal/util/sal.map |1 -
 4 files changed, 5 insertions(+), 40 deletions(-)

New commits:
commit 3f72ad159c881d0a11e638c84064172f48f75026
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 13 08:47:30 2014 +0200

osl_openMemoryAsFile is internal, Android-only functionality

Change-Id: I36734b0e5e1c0b15ed4f0845450b444b23579ffe

diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index b9ddaba..a3cfc73 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -43,9 +43,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
 oslFileHandle Handle,
 sal_IntPtr *piFileHandle );
 
-/* for unit testing. */
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_openMemoryAsFile( void *address, 
size_t size, oslFileHandle *pHandle );
-
 #if defined __cplusplus
 }
 #endif
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 792345d..99fee40 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -780,10 +780,12 @@ static bool osl_file_queryLocking (sal_uInt32 uFlags)
 return false;
 }
 
-#ifdef UNX
+#if defined ANDROID
+
+namespace {
 
 static oslFileError
-osl_openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandle, 
const char *path )
+openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandle, const 
char *path )
 {
 oslFileError eRet;
 FileHandle_Impl * pImpl = new FileHandle_Impl (-1, 
FileHandle_Impl::KIND_MEM, path);
@@ -805,10 +807,6 @@ osl_openMemoryAsFile( void *address, size_t size, 
oslFileHandle *pHandle, const
 return osl_File_E_None;
 }
 
-oslFileError
-SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle 
*pHandle )
-{
-return osl_openMemoryAsFile( address, size, pHandle, anon );
 }
 
 #endif
@@ -848,7 +846,7 @@ SAL_CALL osl_openFilePath( const char *cpFilePath, 
oslFileHandle* pHandle, sal_u
 errno = ENOENT;
 return osl_File_E_NOENT;
 }
-return osl_openMemoryAsFile(address, size, pHandle, cpFilePath);
+return openMemoryAsFile(address, size, pHandle, cpFilePath);
 }
 #endif
 
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index a403d33..0a387e8 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2942,38 +2942,9 @@ namespace osl_File
  *pEOF 
 ( 0 == strncmp( ( const char * 
)aSequence.getArray(), pBuffer_Char[26], 26 ) ) );
 }
-#ifdef UNX
-void readLine_android()
-{
-static const char buffer[] =
-Hello\n\r\n\a\n
-Fun=Badness\n
-Some=Somethingelse\n\r;
-sal_Int32 aHash = rtl_str_hashCode( buffer );
-for (size_t i = 0; i  sizeof (buffer); i += 7)
-{
-oslFileHandle pFile( 0 );
-CPPUNIT_ASSERT( osl_openMemoryAsFile( (void *)buffer,
-  sizeof( buffer ) - i, 
pFile )
-== osl_File_E_None );
-for (;;)
-{
-sal_Sequence *pSequence( 0 );
-if (osl_readLine( pFile, pSequence ) != osl_File_E_None)
-break;
-rtl_byte_sequence_release (pSequence);
-}
-CPPUNIT_ASSERT( osl_closeFile( pFile ) == osl_File_E_None );
-}
-CPPUNIT_ASSERT( aHash == rtl_str_hashCode( buffer ) );
-}
-#endif
 CPPUNIT_TEST_SUITE( readLine );
 CPPUNIT_TEST( readLine_001 );
 CPPUNIT_TEST( readLine_002 );
-#ifdef UNX
-CPPUNIT_TEST( readLine_android );
-#endif
 CPPUNIT_TEST_SUITE_END();
 };// class readLine
 
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 900d077..8380e7e 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -709,7 +709,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
 PRIVATE_file.1 { # LibreOffice 3.6
 global:
 osl_getFileOSHandle;
-   osl_openMemoryAsFile;
 };
 
 # Unique libstdc++ symbols:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl sal/util

[Stephan Bergmann]

 include/osl/detail/file.h |5 -
 sal/osl/unx/file.cxx  |   15 ---
 sal/osl/w32/file.cxx  |   15 ---
 sal/util/sal.map  |5 -
 4 files changed, 40 deletions(-)

New commits:
commit 416543e829922f117ee5dc15125b470099c9e148
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 13 10:05:36 2014 +0200

All three uses of osl_getFileOSHandle have been removed again

...introduced with a64db11b6ca1c0c99937cd99129758dbbe575ac2 Add some 
non-public
API to be used by SvFileStream and e541105b45d5da8df29688394e3a0297a2e7
Use osl API to access files in the SvFileStream code but subsequently
identified as dead code with ab02fa6552fb098990e74f2787cf02b01c0e532b
callcatcher: update list, 05a8216d03b5db559e01dd1808f2805df31c970a
STAR_ENABLE_FILE_LOCKING was a secret, and
1d3483ed279982278b2f9fb1bab63485523e48c5 Remove some unused code from
unusedcode.easy.

Change-Id: I9c8584890270a87e58b8d8021080ffe54bc97b93

diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index a3cfc73..ddcc47e 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -38,11 +38,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
 oslFileHandle* pHandle,
 sal_uInt32 uFlags );
 
-/*  Get the OS specific handle of an open file. */
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
-oslFileHandle Handle,
-sal_IntPtr *piFileHandle );
-
 #if defined __cplusplus
 }
 #endif
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 99fee40..330f194 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1081,21 +1081,6 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
 }
 
 oslFileError
-SAL_CALL osl_getFileOSHandle(
-oslFileHandle Handle,
-sal_IntPtr *piFileHandle )
-{
-FileHandle_Impl* pImpl = static_castFileHandle_Impl*(Handle);
-
-if (0 == pImpl || pImpl-m_kind != FileHandle_Impl::KIND_FD || -1 == 
pImpl-m_fd)
-return osl_File_E_INVAL;
-
-*piFileHandle = pImpl-m_fd;
-
-return osl_File_E_None;
-}
-
-oslFileError
 SAL_CALL osl_mapFile (
 oslFileHandle Handle,
 void**ppAddr,
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index d51c243..1d13804 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -751,21 +751,6 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
 }
 
 oslFileError
-SAL_CALL osl_getFileOSHandle(
-oslFileHandle  Handle,
-sal_IntPtr*piFileHandle )
-{
-FileHandle_Impl* pImpl = static_castFileHandle_Impl*(Handle);
-
-if (0 == pImpl || !IsValidHandle(pImpl-m_hFile))
-return osl_File_E_INVAL;
-
-*piFileHandle = (sal_IntPtr) pImpl-m_hFile;
-
-return osl_File_E_None;
-}
-
-oslFileError
 SAL_CALL osl_closeFile(oslFileHandle Handle)
 {
 FileHandle_Impl * pImpl = static_castFileHandle_Impl*(Handle);
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 8380e7e..e601c6d 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -706,11 +706,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
 _ZN3sal6detail7textenc37handleBadInputUnicodeToTextConversion*;
 };
 
-PRIVATE_file.1 { # LibreOffice 3.6
-global:
-osl_getFileOSHandle;
-};
-
 # Unique libstdc++ symbols:
 GLIBCXX_3.4 {
 global:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/osl sal/qa

[Stephan Bergmann]

 include/osl/detail/file.h|   18 --
 sal/osl/unx/file.cxx |5 +++--
 sal/osl/unx/file_impl.hxx|5 +
 sal/osl/unx/file_misc.cxx|4 ++--
 sal/osl/unx/file_stat.cxx|1 -
 sal/qa/osl/file/osl_File.cxx |1 -
 6 files changed, 10 insertions(+), 24 deletions(-)

New commits:
commit 9a8411d3b13a4e3675f99f36d5b6e81c5eace9b6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 13 10:43:15 2014 +0200

osl_openFilePath is internal sal/osl/unx functionality

Change-Id: I14e4d08f209e3d6a444d6c09f9ffb9c178d8731d

diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index ddcc47e..96d8807 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -12,36 +12,18 @@
 
 #include sal/config.h
 
-#include sys/stat.h
-
-#include sal/saldllapi.h
-#include sal/types.h
-
 /** @cond INTERNAL */
 
 /* Some additions to the osl file functions for LibreOffice internal
use. Needed for details in the Android support.
  */
 
-#if defined __cplusplus
-extern C {
-#endif
-
 /* More flags needed for semantics that match the open() call that
used to be in SvFileStream::Open().
 */
 #define osl_File_OpenFlag_Trunc 0x0010L
 #define osl_File_OpenFlag_NoExcl0x0020L
 
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
-const char *cpFilePath,
-oslFileHandle* pHandle,
-sal_uInt32 uFlags );
-
-#if defined __cplusplus
-}
-#endif
-
 /** @endcond */
 
 #endif /* INCLUDED_OSL_DETAIL_FILE_H */
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 330f194..72fda5a 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -33,6 +33,7 @@
 #include system.h
 #include createfilehandlefromfd.hxx
 #include file_error_transl.h
+#include file_impl.hxx
 #include file_url.h
 #include uunxapi.h
 
@@ -820,7 +821,7 @@ openMemoryAsFile( void *address, size_t size, oslFileHandle 
*pHandle, const char
 #endif
 
 oslFileError
-SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, 
sal_uInt32 uFlags )
+openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_uInt32 
uFlags )
 {
 oslFileError eRet;
 
@@ -1015,7 +1016,7 @@ SAL_CALL osl_openFile( rtl_uString* ustrFileURL, 
oslFileHandle* pHandle, sal_uIn
 return oslTranslateFileError (OSL_FET_ERROR, errno);
 #endif /* MACOSX */
 
-return osl_openFilePath (buffer, pHandle, uFlags);
+return openFilePath (buffer, pHandle, uFlags);
 }
 
 oslFileError
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index 7d90b3d..db8ce4e 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -43,6 +43,11 @@ struct DirectoryItem_Impl
 oslFileType getFileType() const;
 };
 
+oslFileError openFilePath(
+const char *cpFilePath,
+oslFileHandle* pHandle,
+sal_uInt32 uFlags );
+
 #endif /* INCLUDED_FILE_IMPL_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index f238f28..7662d9f 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -915,11 +915,11 @@ static int oslDoCopyFile(const sal_Char* 
pszSourceFileName, const sal_Char* pszD
 int DestFileFD=0;
 int nRet=0;
 
-if (osl_openFilePath(pszSourceFileName,
+if (openFilePath(pszSourceFileName,
  SourceFileFH,
  
osl_File_OpenFlag_Read|osl_File_OpenFlag_NoLock|osl_File_OpenFlag_NoExcl) != 
osl_File_E_None)
 {
-// Let's hope errno is still set relevantly after osl_openFilePath...
+// Let's hope errno is still set relevantly after openFilePath...
 nRet=errno;
 return nRet;
 }
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 6c5f6a6..ce6c5d9 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -18,7 +18,6 @@
  */
 
 #include osl/file.h
-#include osl/detail/file.h
 
 #include system.h
 #include sys/types.h
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 0a387e8..ba0a3a0 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -26,7 +26,6 @@
 #include osl/thread.h
 
 #include osl/file.hxx
-#include osl/detail/file.h
 #include osl_File_Const.h
 
 #include cppunit/TestFixture.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl registry/test

[Michaël Lefèvre]

 include/osl/diagnose.h  |2 --
 registry/test/regdiagnose.h |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit fe075edc27a1fc301c31cfdff5ddbc83e52d929f
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date:   Mon Apr 7 15:33:26 2014 +0200

fdo#43157 : [API CHANGE] Remove OSL_THIS_FILE

Change-Id: Ifa6bdb2f2bdf96826f09c42a1e36d97ed6e034cd
Reviewed-on: https://gerrit.libreoffice.org/8886
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index e64160c..fdae8cc 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -87,8 +87,6 @@
 #define OSL_DEBUG_LEVEL 0
 #endif
 
-#define OSL_THIS_FILE   __FILE__
-
 /* the macro OSL_LOG_PREFIX is intended to be an office internal macro for now
 
it is deprecated and superseded by (C++ only) SAL_WHERE
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 1ac6e92..69aa1b1 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -23,7 +23,7 @@
 
 #include osl/diagnose.h
 
-#define REG_ENSURE(c, m)   _REG_ENSURE(c, OSL_THIS_FILE, __LINE__, m)
+#define REG_ENSURE(c, m)   _REG_ENSURE(c, __FILE__, __LINE__, m)
 
 #define _REG_ENSURE(c, f, l, m) \
 do \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl registry/test

[Michaël Lefèvre]

 include/osl/diagnose.h  |6 --
 registry/test/regdiagnose.h |4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit df2c663fef3435a8c3d541b364780876229ccd29
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date:   Mon Apr 7 16:10:57 2014 +0200

fdo#43157 [API CHANGE] Remove deprecated _OSL_GLOBAL

Signed-off-by: Stephan Bergmann sberg...@redhat.com
Conflicts:
include/osl/diagnose.h

Change-Id: Ie2e6b7a8546318bdd8b81261bef46bf92c0c125f

diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index 4137d21..e64160c 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -114,12 +114,6 @@
 #define OSL_POSTCOND(c, m)  OSL_ENSURE(c, m)
 
 
-#ifdef __cplusplus
-#define _OSL_GLOBAL ::
-#else
-#define _OSL_GLOBAL
-#endif  /* __cplusplus */
-
 /* the macro OSL_THIS_FUNC is intended to be an office internal macro for now 
*/
 /* copied from boost/current_function.hpp to make it usable from C
  * sources as well
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 721db1d..1ac6e92 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -28,8 +28,8 @@
 #define _REG_ENSURE(c, f, l, m) \
 do \
 {  \
-if (!(c)  _OSL_GLOBAL osl_assertFailedLine(f, l, m)) \
-_OSL_GLOBAL osl_breakDebug(); \
+if (!(c)  :: osl_assertFailedLine(f, l, m)) \
+:: osl_breakDebug(); \
 } while (0)
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Jan Holesovsky]

 include/osl/detail/component-defines.h |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9dae84647a35ba356df3f4dae8022dee0ad8bed8
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Jan 20 18:18:46 2014 +0100

component-defines.h should be generated.

Change-Id: I759d119e0ad6c5ae2881284c82292d4d9cb7ae87

diff --git a/include/osl/detail/component-defines.h 
b/include/osl/detail/component-defines.h
index 86a04b5..791ff8a 100644
--- a/include/osl/detail/component-defines.h
+++ b/include/osl/detail/component-defines.h
@@ -12,6 +12,9 @@
 
 /* Experimental direct constructor calls, under construction */
 
+/* FIXME: Rather than hardcoded, this should be generated from
+   solenv/bin/native-code.py */
+
 #define LO_URE_CURRENT_ENV 1 /*TODO*/
 
 #define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 1 
/*TODO*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl solenv/bin

[Tor Lillqvist]

 include/osl/detail/component-defines.h |4 ++--
 solenv/bin/native-code.py  |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit df31a0e3edc8dae5feaed48e8731fa4d7d440117
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Jan 15 20:00:41 2014 +0200

Fix fallout after a700ce8e2b2f2dad50bf36dfd69de577211f1dc3

Change-Id: I489126d291f9420aa1692d4b1f187f72dfd92a62

diff --git a/include/osl/detail/component-defines.h 
b/include/osl/detail/component-defines.h
index 058a332..86a04b5 100644
--- a/include/osl/detail/component-defines.h
+++ b/include/osl/detail/component-defines.h
@@ -15,9 +15,9 @@
 #define LO_URE_CURRENT_ENV 1 /*TODO*/
 
 #define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 1 
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 
com_sun_star_comp_extensions_xml_sax_FastParser
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_FastParser 
com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation
 #define LO_URE_CTOR_ENV_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 1 
/*TODO*/
-#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 
com_sun_star_comp_extensions_xml_sax_ParserExpat
+#define LO_URE_CTOR_FUN_com_dot_sun_dot_star_dot_xml_dot_sax_dot_Parser 
com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation
 
 #endif
 
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 02a607e..b90e0e2 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -51,12 +51,12 @@ core_factory_list = [
 
 core_constructor_list = [
 # sax/source/expatwrap/expwrap.component
-com_sun_star_comp_extensions_xml_sax_ParserExpat,
-com_sun_star_comp_extensions_xml_sax_FastParser,
+com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation,
+com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation,
 # svtools/util/svt.component
 com_sun_star_comp_graphic_GraphicProvider_get_implementation,
 # svx/util/svx.component
-com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory,
+com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation,
 ]
 
 extended_core_factory_list = core_factory_list + [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl

[Stephan Bergmann]

 include/osl/detail/component-declarations.h |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 61e02585ea3ab6794fcae28c9b96d35b3ff96257
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 09:58:59 2013 +0100

Fix up constructor function declarations

Change-Id: I68ec96b20da1603e5cafd31d620d8dd54306627a

diff --git a/include/osl/detail/component-declarations.h 
b/include/osl/detail/component-declarations.h
index 8bcbda3..b8fb658 100644
--- a/include/osl/detail/component-declarations.h
+++ b/include/osl/detail/component-declarations.h
@@ -97,18 +97,18 @@ void * xo_component_getFactory( const char * , void * , 
void * );
 void * xof_component_getFactory( const char * , void * , void * );
 void * xstor_component_getFactory( const char * , void * , void * );
 
-void * com_sun_star_comp_extensions_xml_sax_FastParser_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_extensions_xml_sax_ParserExpat_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_DLLComponentLoader_component_getFactory( const 
char * , void * , void * );
-void * com_sun_star_comp_stoc_ImplementationRegistration_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_NestedRegistry_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_comp_stoc_ORegistryServiceManager_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_OServiceManager_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_comp_stoc_OServiceManagerWrapper_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_SimpleRegistry_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_extensions_xml_sax_Writer_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_security_comp_stoc_AccessController_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_security_comp_stoc_FilePolicy_component_getFactory( const 
char * , void * , void * );
+void * com_sun_star_comp_extensions_xml_sax_FastParser( void * , void * );
+void * com_sun_star_comp_extensions_xml_sax_ParserExpat( void * , void * );
+void * com_sun_star_comp_stoc_DLLComponentLoader( void * , void * );
+void * com_sun_star_comp_stoc_ImplementationRegistration( void * , void * );
+void * com_sun_star_comp_stoc_NestedRegistry( void * , void * );
+void * com_sun_star_comp_stoc_ORegistryServiceManager( void * , void * );
+void * com_sun_star_comp_stoc_OServiceManager( void * , void * );
+void * com_sun_star_comp_stoc_OServiceManagerWrapper( void * , void * );
+void * com_sun_star_comp_stoc_SimpleRegistry( void * , void * );
+void * com_sun_star_extensions_xml_sax_Writer( void * , void * );
+void * com_sun_star_security_comp_stoc_AccessController( void * , void * );
+void * com_sun_star_security_comp_stoc_FilePolicy( void * , void * );
 
 #ifdef __cplusplus
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits