diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-01-11 13:00:12 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-01-11 13:00:12 -0500 |
| commit | 29d8d1f32dd98ac87a0cfefbca48c9efaf62c4d2 (patch) | |
| tree | e391429aa169cf2ab996c19565318fee74657f9c /desktop | |
| parent | be52cfe4526c24516c461109227f8ae86901bc68 (diff) | |
Use --splash-pipe instead of -splash-pipe.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/unx/source/start.c | 2 | ||||
| -rw-r--r-- | desktop/unx/splash/unxsplash.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index 84f80d457630..f2536a586cf1 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -685,7 +685,7 @@ fork_app( rtl_uString *pAppPath, int *status_fd ) sal_Unicode pUnicode[RTL_USTR_MAX_VALUEOFINT32]; rtl_ustr_valueOfInt32( pUnicode, status_pipe[1], 10 ); - rtl_uString_newFromAscii( &pArg, "-splash-pipe=" ); + rtl_uString_newFromAscii( &pArg, "--splash-pipe=" ); rtl_uString_newFromStr( &pTmp, pUnicode ); rtl_uString_newConcat( &pArg, pArg, pTmp ); diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index 261fb5c8b276..518dad345729 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -38,7 +38,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> -#define PIPE_ARG "-splash-pipe=" +#define PIPE_ARG "--splash-pipe=" using namespace ::rtl; using namespace ::com::sun::star::registry; @@ -103,7 +103,7 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue ) { if ( m_pOutFd ) { - fprintf( m_pOutFd, "%d%%\n", nValue ); + fprintf( m_pOutFd, "%ld%%\n", nValue ); fflush( m_pOutFd ); } } @@ -124,7 +124,7 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun:: int fd = aNum.toInt32(); m_pOutFd = fdopen( fd, "w" ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "Got argument '-splash-pipe=%d ('%s') (%p)\n", + fprintf( stderr, "Got argument '--splash-pipe=%d ('%s') (%p)\n", fd, (const sal_Char *)rtl::OUStringToOString( aNum, RTL_TEXTENCODING_UTF8 ), m_pOutFd ); #endif |