From ae635c1eda512ad4e2d2f9181d6118654ff77e70 Mon Sep 17 00:00:00 2001 From: Florian Bircher Date: Mon, 18 Oct 2010 18:54:59 -0500 Subject: use SAL_N_ELEMENTS --- desktop/win32/source/officeloader/officeloader.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'desktop/win32/source/officeloader') diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 0588814a9076..d3335c80a560 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -230,7 +230,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) TEXT("FastPipeCommunication"), TEXT("0"), szKey, - elementsof(szKey), + SAL_N_ELEMENTS(szKey), szPerfTuneIniFile ); @@ -258,10 +258,10 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) fSuccess = ConvertSidToStringSid( pSid, &szUserIdent ); - _tcsncpy( szPipeName, PIPE_PREFIX, elementsof(szPipeName) ); - _tcsncat( szPipeName, szUserIdent, elementsof(szPipeName) - _tcslen(szPipeName) - 1 ); - _tcsncat( szPipeName, PIPE_POSTFIX, elementsof(szPipeName) - _tcslen(szPipeName) - 1 ); - _tcsncat( szPipeName, _ultot( SUPD, szSUPD, 10), elementsof(szPipeName) - _tcslen(szPipeName) - 1 ); + _tcsncpy( szPipeName, PIPE_PREFIX, SAL_N_ELEMENTS(szPipeName) ); + _tcsncat( szPipeName, szUserIdent, SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 ); + _tcsncat( szPipeName, PIPE_POSTFIX, SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 ); + _tcsncat( szPipeName, _ultot( SUPD, szSUPD, 10), SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 ); LocalFree( szUserIdent ); -- cgit