diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-17 13:14:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-23 08:08:56 +0200 |
| commit | c45d3badc96481db093560b94d8bf51ead6bd17c (patch) | |
| tree | 4bb6c9220678a12b327e46ca2acd01e77fc8e2c4 /desktop | |
| parent | 003d0ccf902d2449320dd24119564565a384f365 (diff) | |
new loplugin: commaoperator
Change-Id: I03f24e61f696b7619855e3c7010aa0d874e5a4ff
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | desktop/unx/source/file_image_unx.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 107639d8179b..cc69bbb60257 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1661,7 +1661,8 @@ int Desktop::doShutdown() pExecGlobals->xGlobalBroadcaster->documentEventOccured(aEvent); } - delete pResMgr, pResMgr = nullptr; + delete pResMgr; + pResMgr = nullptr; // Restore old value const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() ) @@ -1703,7 +1704,8 @@ int Desktop::doShutdown() pExecGlobals->pPathOptions.reset( nullptr ); bool bRR = pExecGlobals->bRestartRequested; - delete pExecGlobals, pExecGlobals = nullptr; + delete pExecGlobals; + pExecGlobals = nullptr; if ( bRR ) { diff --git a/desktop/unx/source/file_image_unx.c b/desktop/unx/source/file_image_unx.c index c73e30b5134d..522c49171f49 100644 --- a/desktop/unx/source/file_image_unx.c +++ b/desktop/unx/source/file_image_unx.c @@ -42,7 +42,8 @@ int file_image_open (file_image * image, const char * filename) if (image == NULL) return EINVAL; - image->m_base = MAP_FAILED, image->m_size = 0; + image->m_base = MAP_FAILED; + image->m_size = 0; if ((fd = open (filename, O_RDONLY)) == -1) return errno; @@ -60,7 +61,8 @@ int file_image_open (file_image * image, const char * filename) goto cleanup_and_leave; } - image->m_base = p, image->m_size = st.st_size; + image->m_base = p; + image->m_size = st.st_size; cleanup_and_leave: close (fd); @@ -118,7 +120,8 @@ int file_image_close (file_image * image) if (munmap (image->m_base, image->m_size) == -1) return errno; - image->m_base = NULL, image->m_size = 0; + image->m_base = NULL; + image->m_size = 0; return 0; } |