[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - sal/osl

[Thorsten Behrens]

 sal/osl/unx/process_impl.cxx |    3 ---
 sal/osl/w32/process.cxx      |    3 ---
 2 files changed, 6 deletions(-)

New commits:
commit 992842d9b17606850ac577dd823fa44b508495e9
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Fri Dec 23 01:10:40 2016 +0100

    HACK: Avoid recursion in osl_getCommandArgCount
    
    Change-Id: I1916abb7bec539597fb3080918c66a1ab8d3fc40

diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 20cda83..1fbceba 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -162,9 +162,6 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount()
     sal_uInt32 result = 0;
 
     pthread_mutex_lock (&(g_command_args.m_mutex));
-    SAL_INFO_IF(
-        g_command_args.m_nCount == 0, "sal.osl",
-        "osl_getCommandArgCount w/o prior call to osl_setCommandArgs");
     if (g_command_args.m_nCount > 0)
         result = g_command_args.m_nCount - 1;
     pthread_mutex_unlock (&(g_command_args.m_mutex));
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 0a85135..3d7cd10 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -327,9 +327,6 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount()
     sal_uInt32 result = 0;
 
     osl_acquireMutex (*osl_getGlobalMutex());
-    SAL_INFO_IF(
-        g_command_args.m_nCount == 0, "sal.osl",
-        "osl_getCommandArgCount w/o prior call to osl_setCommandArgs");
     if (g_command_args.m_nCount > 0)
     {
         /* We're not counting argv[0] here. */