summaryrefslogtreecommitdiff
path: root/desktop/unx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-03-21 17:38:35 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-03-21 17:38:35 +0100
commit3d952e795a2101d2bfd2c0dcd6047049c38e6f54 (patch)
tree59c17239c5e643b279fefdaddad66ae188398040 /desktop/unx
parent0630544a1a7f435ff3fec7075d19d352b5ed5b90 (diff)
No, I don't want to see that "bootstap" typo on every start of soffice
Silly of 221144f9c995fe30adf577c02f756b3123fb2550 "tdf#91794 OSL_DEBUG_LEVEL > 1 removed (desktop)" to make that output conditional on just OSL_DEBUG_LEVEL>0. Can't use sal/log.hxx here, and demand for this debug output is probably rare to non-existant, so just remove it. Change-Id: Ie8c7846f785c7875375af215934c71ff28085458
Diffstat (limited to 'desktop/unx')
-rw-r--r--desktop/unx/source/start.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index c867bf3e7463..a988fc852262 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -64,21 +64,6 @@ charp_to_ustr( const char *pStr )
return pOut;
}
-/* Easier debugging of rtl_uString values. */
-#if OSL_DEBUG_LEVEL > 0
-static void ustr_debug( const char *pMessage, rtl_uString *pStr )
-{
- rtl_String *pOut = ustr_to_str( pStr );
-
- fprintf( stderr, "%s: %s\n", pMessage, rtl_string_getStr( pOut ) );
-
- rtl_string_release( pOut );
- return;
-}
-#else
-#define ustr_debug(a, b) {}
-#endif
-
typedef struct {
int status_fd;
oslProcess child;
@@ -158,7 +143,6 @@ child_spawn ( Args *args, sal_Bool bAllArgs, sal_Bool bWithStatus )
if ( nError != osl_Process_E_None )
{
fprintf( stderr, "ERROR %d forking process\n", nError );
- ustr_debug( "", pApp );
rtl_uString_release( pApp );
_exit (1);
}
@@ -236,19 +220,10 @@ get_md5hash( rtl_uString *pText )
sal_uInt32 md5_key_len = 0;
sal_uInt8* md5_buf = NULL;
sal_uInt32 i = 0;
-#if OSL_DEBUG_LEVEL > 0
- rtl_String *pOut;
-#endif
if ( !pText )
return NULL;
-#if OSL_DEBUG_LEVEL > 0
- pOut = ustr_to_str( pText );
- fprintf (stderr, "Generate pipe md5 for '%s'\n", pOut->buffer);
- rtl_string_release( pOut );
-#endif
-
pData = (unsigned char *)rtl_uString_getStr( pText );
nSize = rtl_uString_getLength( pText ) * sizeof( sal_Unicode );
if ( !pData )
@@ -301,8 +276,6 @@ get_pipe_path( rtl_uString *pAppPath )
rtl_uString_newFromAscii( &pTmp, SAL_CONFIGFILE( "bootstrap" ) );
rtl_uString_newConcat( &pPath, pPath, pTmp );
- ustr_debug( "bootstap", pPath );
-
/* read userinstallation value */
handle = rtl_bootstrap_args_open( pPath );
@@ -317,7 +290,6 @@ get_pipe_path( rtl_uString *pAppPath )
rtl_uString_newFromString (&pAbsUserInstallation, pUserInstallation);
/* create the pipe name */
- ustr_debug( "user installation", pAbsUserInstallation );
pMd5hash = get_md5hash( pAbsUserInstallation );
if ( !pMd5hash )
rtl_uString_new( &pMd5hash );
@@ -344,8 +316,6 @@ get_pipe_path( rtl_uString *pAppPath )
rtl_uString_newConcat( &pResult, pResult, pMd5hash );
- ustr_debug( "result", pResult );
-
/* cleanup */
rtl_uString_release( pMd5hash );
rtl_uString_release( pPath );
@@ -493,8 +463,6 @@ send_args( int fd, rtl_uString *pCwdPath )
rtl_uString_release( pEscapedTmp );
}
- ustr_debug( "Pass args", pBuffer );
-
if ( !rtl_convertUStringToString(
&pOut, rtl_uString_getStr( pBuffer ),
rtl_uString_getLength( pBuffer ), RTL_TEXTENCODING_UTF8,
@@ -779,7 +747,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
fprintf( stderr, "ERROR: Can't read app link\n" );
exit( 1 );
}
- ustr_debug( "App path", args->pAppPath );
#ifndef ENABLE_QUICKSTART_LIBPNG
/* we can't load and render it anyway */
@@ -813,10 +780,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
close( fd );
}
-#if OSL_DEBUG_LEVEL > 0
- else
- ustr_debug( "Failed to connect to pipe", pPipePath );
-#endif
}
if ( !bSentArgs )