mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#147021 Use std::size() instead of SAL_N_ELEMENTS()

Browse Source 
Change-Id: I327c2724b2212551c8f957b5b4c151e317094fa2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183050
Reviewed-by: David Gilbert <freedesktop@treblig.org>
Tested-by: Jenkins
This commit is contained in:
Ahmed Khaled 2025-03-18 02:45:18 +02:00 committed by David Gilbert
parent 5d5948cf5e
commit d87694cf93
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sal/osl/w32/file_dirvol.cxx
View File

@ -1046,16 +1046,16 @@ static bool is_floppy_volume_mount_point(const OUString& path)
systemPathEnsureSeparator(p);
WCHAR vn[51];
if (GetVolumeNameForVolumeMountPointW(o3tl::toW(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
if (GetVolumeNameForVolumeMountPointW(o3tl::toW(p.getStr()), vn, std::size(vn)))
{
WCHAR vnfloppy[51];
if (is_floppy_A_present() &&
GetVolumeNameForVolumeMountPointW(FLOPPY_A, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
GetVolumeNameForVolumeMountPointW(FLOPPY_A, vnfloppy, std::size(vnfloppy)) &&
(0 == wcscmp(vn, vnfloppy)))
return true;
if (is_floppy_B_present() &&
GetVolumeNameForVolumeMountPointW(FLOPPY_B, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
GetVolumeNameForVolumeMountPointW(FLOPPY_B, vnfloppy, std::size(vnfloppy)) &&
(0 == wcscmp(vn, vnfloppy)))
return true;
}
@ -1113,7 +1113,7 @@ static UINT get_volume_mount_point_drive_type(const OUString& path)
systemPathEnsureSeparator(p);
WCHAR vn[51];
if (GetVolumeNameForVolumeMountPointW(o3tl::toW(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
if (GetVolumeNameForVolumeMountPointW(o3tl::toW(p.getStr()), vn, std::size(vn)))
return GetDriveTypeW(vn);
return DRIVE_NO_ROOT_DIR;
@ -1356,7 +1356,7 @@ static oslFileError osl_getDriveInfo(
case DRIVE_REMOTE:
{
WCHAR szBuffer[1024];
DWORD const dwBufsizeConst = SAL_N_ELEMENTS(szBuffer);
DWORD const dwBufsizeConst = std::size(szBuffer);
DWORD dwBufsize = dwBufsizeConst;
DWORD dwResult = WNetGetConnectionW( cDrive, szBuffer, &dwBufsize );
@ -1375,7 +1375,7 @@ static oslFileError osl_getDriveInfo(
case DRIVE_FIXED:
{
WCHAR szVolumeNameBuffer[1024];
DWORD const dwBufsizeConst = SAL_N_ELEMENTS(szVolumeNameBuffer);
DWORD const dwBufsizeConst = std::size(szVolumeNameBuffer);
if ( GetVolumeInformationW( cRoot, szVolumeNameBuffer, dwBufsizeConst, nullptr, nullptr, nullptr, nullptr, 0 ) )
{