sal/osl/unx/file_misc.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 20c749d87c2b45f3b905f6d73bc5bc9a8c09a17c
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Wed Jul 5 12:25:06 2017 +1000
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 <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
