diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2016-03-09 02:16:47 +0530 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-03-12 14:35:40 +0000 |
| commit | 221144f9c995fe30adf577c02f756b3123fb2550 (patch) | |
| tree | ed4f260d8b78016ff972306b8735ad65fbcbffe0 /desktop/unx | |
| parent | 1151fec7a8c3dfcbc364aa941f477004309b1e59 (diff) | |
tdf#91794 OSL_DEBUG_LEVEL > 1 removed (desktop)
[UPDATED PATCH]: I removed the trailing newline characters in the
SAL_WARN macro as pointed by Jan Iverson
Change-Id: If90b0d44777ec2ab1bd646f22f4c9cdf798cf8b4
Reviewed-on: https://gerrit.libreoffice.org/22315
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'desktop/unx')
| -rw-r--r-- | desktop/unx/source/start.c | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index b072f0f01c25..c867bf3e7463 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -65,9 +65,8 @@ charp_to_ustr( const char *pStr ) } /* Easier debugging of rtl_uString values. */ -#if OSL_DEBUG_LEVEL > 1 -static void -ustr_debug( const char *pMessage, rtl_uString *pStr ) +#if OSL_DEBUG_LEVEL > 0 +static void ustr_debug( const char *pMessage, rtl_uString *pStr ) { rtl_String *pOut = ustr_to_str( pStr ); @@ -77,7 +76,7 @@ ustr_debug( const char *pMessage, rtl_uString *pStr ) return; } #else -#define ustr_debug( a, b ) {} +#define ustr_debug(a, b) {} #endif typedef struct { @@ -237,14 +236,14 @@ get_md5hash( rtl_uString *pText ) sal_uInt32 md5_key_len = 0; sal_uInt8* md5_buf = NULL; sal_uInt32 i = 0; -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 rtl_String *pOut; #endif if ( !pText ) return NULL; -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 pOut = ustr_to_str( pText ); fprintf (stderr, "Generate pipe md5 for '%s'\n", pOut->buffer); rtl_string_release( pOut ); @@ -575,9 +574,6 @@ read_percent( ChildInfo *info, int *pPercent ) } } -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "Got status: %s\n", pBegin ); -#endif if ( !strncasecmp( pBegin, "end", 3 ) ) return ProgressExit; else if ( !strncasecmp( pBegin, "restart", 7 ) ) @@ -730,9 +726,6 @@ exec_javaldx (Args *args) *chomp = '\0'; } -#if OSL_DEBUG_LEVEL > 1 - fprintf (stderr, "Adding javaldx path of '%s'\n", newpath); -#endif extend_library_path (newpath); if (javaldx) @@ -820,7 +813,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) close( fd ); } -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 else ustr_debug( "Failed to connect to pipe", pPipePath ); #endif @@ -877,31 +870,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) bShortWait = sal_False; } -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "Polling, result is %s\n", - ( eResult == ProgressContinue )? "continue" : - ( ( eResult == ProgressRestart )? "restart" : "exit" ) ); -#endif } -#if OSL_DEBUG_LEVEL > 1 - fprintf (stderr, "Exited with code '%d'\n", child_get_exit_code (info)); -#endif status = child_get_exit_code(info); g_pProcess = NULL; // reset switch (status) { case EXITHELPER_CRASH_WITH_RESTART: // re-start with just -env: parameters -#if OSL_DEBUG_LEVEL > 1 - fprintf (stderr, "oosplash: re-start with just -env: params !\n"); -#endif bRestart = sal_True; bAllArgs = sal_False; break; case EXITHELPER_NORMAL_RESTART: // re-start with all arguments -#if OSL_DEBUG_LEVEL > 1 - fprintf (stderr, "oosplash: re-start with all params !\n"); -#endif bRestart = sal_True; bAllArgs = sal_True; break; |