diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-07-05 12:25:06 +1000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-07-07 21:21:22 +0200 |
| commit | 20c749d87c2b45f3b905f6d73bc5bc9a8c09a17c (patch) | |
| tree | 58b277b4f81a909dc6a38bd8e3b3fc6a20cf9ec4 /sal | |
| parent | 00def4025b5fd95b0fc8d88fbbb9477526e8b12e (diff) | |
osl: unx osl_getDirectoryItem() cleanup
Whitespacing made consistent in function, and switch to more conventional
nullptr testing style.
Change-Id: I70921e9f79e8e0ebf4a74b84f73313aed033ec5b
Reviewed-on: https://gerrit.libreoffice.org/39538
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file_misc.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 4b6c9e12b8fd..9f5905b36d9d 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -345,13 +345,13 @@ oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory pDirectory, return osl_File_E_None; } -oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirectoryItem* pItem ) +oslFileError SAL_CALL osl_getDirectoryItem(rtl_uString* ustrFileURL, oslDirectoryItem* pItem) { rtl_uString* ustrSystemPath = nullptr; - oslFileError osl_error = osl_File_E_INVAL; + oslFileError osl_error = osl_File_E_INVAL; - OSL_ASSERT((nullptr != ustrFileURL) && (nullptr != pItem)); - if ((ustrFileURL == nullptr) || (ustrFileURL->length == 0) || (pItem == nullptr)) + OSL_ASSERT((ustrFileURL) && (pItem)); + if ((!ustrFileURL) || (ustrFileURL->length == 0) || (!pItem)) return osl_File_E_INVAL; osl_error = osl_getSystemPathFromFileURL_Ex(ustrFileURL, &ustrSystemPath); |