diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-08-29 23:30:36 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-08-29 23:37:29 +1000 |
commit | 59a25f6f82656d34735168036f7c5f923a505ce1 (patch) | |
tree | 1dbe67f8fdfe3fa6cf61eedf8b1dfcdfdd09e048 /desktop | |
parent | 36e31c6a6fbbeebd4825f318ebae2ea6c7e6719f (diff) |
desktop: convert all sal_Bool to bool in start.c
Change-Id: I27480e0ee5e247730e5368f57d57c8dea439d3d5
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/unx/source/start.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index 71cabe02103f..d864e3f4a9fd 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -81,7 +81,7 @@ child_info_destroy(ChildInfo *info) free (info); } -static ChildInfo * child_spawn(Args *args, sal_Bool bAllArgs, sal_Bool bWithStatus) +static ChildInfo * child_spawn(Args *args, bool bAllArgs, bool bWithStatus) { rtl_uString *pApp = nullptr, *pTmp = nullptr; rtl_uString **ppArgs; @@ -150,7 +150,7 @@ static ChildInfo * child_spawn(Args *args, sal_Bool bAllArgs, sal_Bool bWithStat return info; } -static sal_Bool child_exited_wait(ChildInfo *info, sal_Bool bShortWait) +static bool child_exited_wait(ChildInfo *info, bool bShortWait) { TimeValue t = { 0, 250 /* ms */ * 1000 * 1000 }; if (!bShortWait) @@ -405,12 +405,12 @@ static rtl_uString *escape_path(rtl_uString *pToEscape) } /* Send args to the LO instance (using the 'fd' file descriptor) */ -static sal_Bool send_args(int fd, rtl_uString *pCwdPath) +static bool send_args(int fd, rtl_uString *pCwdPath) { rtl_uString *pBuffer = nullptr, *pTmp = nullptr; sal_Int32 nCapacity = 1000; rtl_String *pOut = nullptr; - sal_Bool bResult; + bool bResult; size_t nLen; rtl_uString *pEscapedCwdPath = escape_path(pCwdPath); sal_uInt32 nArg = 0; @@ -727,7 +727,7 @@ void sigterm_handler(int ignored) SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { - sal_Bool bSentArgs = sal_False; + bool bSentArgs = false; const char* pUsePlugin; rtl_uString *pPipePath = nullptr; Args *args; @@ -756,12 +756,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) #ifndef ENABLE_QUICKSTART_LIBPNG /* we can't load and render it anyway */ - args->bInhibitSplash = sal_True; + args->bInhibitSplash = true; #endif pUsePlugin = getenv("SAL_USE_VCLPLUGIN"); if (pUsePlugin && !strcmp(pUsePlugin, "svp")) - args->bInhibitSplash = sal_True; + args->bInhibitSplash = true; if (!args->bInhibitPipe && !getenv("LIBO_FLATPAK")) { @@ -793,8 +793,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) /* we have to prepare for, and exec the binary */ int nPercent = 0; ChildInfo *info; - sal_Bool bAllArgs = sal_True; - sal_Bool bShortWait, bRestart; + bool bAllArgs = true; + bool bShortWait, bRestart; /* sanity check pieces */ system_checks(); @@ -815,10 +815,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) do { - bRestart = sal_False; + bRestart = false; /* fast updates if we have somewhere to update it to */ - bShortWait = splash ? sal_True : sal_False; + bShortWait = splash ? true : false; /* Periodically update the splash & the percent according to what status_fd says, poll quickly only while starting */ @@ -836,7 +836,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { splash_destroy(splash); splash = nullptr; - bShortWait = sal_False; + bShortWait = false; } } @@ -846,12 +846,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) switch (status) { case EXITHELPER_CRASH_WITH_RESTART: // re-start with just -env: parameters - bRestart = sal_True; - bAllArgs = sal_False; + bRestart = true; + bAllArgs = false; break; case EXITHELPER_NORMAL_RESTART: // re-start with all arguments - bRestart = sal_True; - bAllArgs = sal_True; + bRestart = true; + bAllArgs = true; break; default: break; |