diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-25 23:35:47 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-25 23:35:47 +0100 |
| commit | 54981ce9286073306513fa58405ebc7730eb6dfb (patch) | |
| tree | d051af6046c6cc4128d02217f37c35e6154f9222 /sal/osl/unx/process_impl.cxx | |
| parent | 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 (diff) | |
Adapt some logs and assertions
...cf. previous 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 "Revert 'pyuno: set up
fake command line in getComponentContext().'"
Change-Id: Ia77132465ada17a5839f9d4f9ccaf20f8b113075
Diffstat (limited to 'sal/osl/unx/process_impl.cxx')
| -rw-r--r-- | sal/osl/unx/process_impl.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 3942f14d5cee..0936b38948fe 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -164,7 +164,9 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount (void) sal_uInt32 result = 0; pthread_mutex_lock (&(g_command_args.m_mutex)); - SAL_WARN_IF (g_command_args.m_nCount == 0, "sal.osl", "osl_setCommandArgs() not called before calling osl_getCommandArgCount()"); + 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)); @@ -180,7 +182,7 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC oslProcessError result = osl_Process_E_NotFound; pthread_mutex_lock (&(g_command_args.m_mutex)); - OSL_ASSERT(g_command_args.m_nCount > 0); + assert(g_command_args.m_nCount > 0); if (g_command_args.m_nCount > (nArg + 1)) { rtl_uString_assign (strCommandArg, g_command_args.m_ppArgs[nArg + 1]); @@ -204,7 +206,7 @@ int SAL_CALL osl_areCommandArgsSet (void) **************************************/ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) { - OSL_ASSERT(argc > 0); + assert(argc > 0); pthread_mutex_lock (&(g_command_args.m_mutex)); assert (g_command_args.m_nCount == 0); if (g_command_args.m_nCount == 0) |