Index: webrtc/base/win32filesystem.cc |
diff --git a/webrtc/base/win32filesystem.cc b/webrtc/base/win32filesystem.cc |
index 8ac918ff8338d07ffe941fd70aa6973afaf9812b..b731974bac49548ed20fa07687b58bcf68683353 100644 |
--- a/webrtc/base/win32filesystem.cc |
+++ b/webrtc/base/win32filesystem.cc |
@@ -15,6 +15,7 @@ |
#include <shlobj.h> |
#include <tchar.h> |
+#include "webrtc/base/arraysize.h" |
#include "webrtc/base/fileutils.h" |
#include "webrtc/base/pathutils.h" |
#include "webrtc/base/scoped_ptr.h" |
@@ -197,16 +198,16 @@ bool Win32Filesystem::DeleteEmptyFolder(const Pathname &folder) { |
bool Win32Filesystem::GetTemporaryFolder(Pathname &pathname, bool create, |
const std::string *append) { |
wchar_t buffer[MAX_PATH + 1]; |
- if (!::GetTempPath(ARRAY_SIZE(buffer), buffer)) |
+ if (!::GetTempPath(arraysize(buffer), buffer)) |
return false; |
if (!IsCurrentProcessLowIntegrity() && |
- !::GetLongPathName(buffer, buffer, ARRAY_SIZE(buffer))) |
+ !::GetLongPathName(buffer, buffer, arraysize(buffer))) |
return false; |
size_t len = strlen(buffer); |
if ((len > 0) && (buffer[len-1] != '\\')) { |
- len += strcpyn(buffer + len, ARRAY_SIZE(buffer) - len, L"\\"); |
+ len += strcpyn(buffer + len, arraysize(buffer) - len, L"\\"); |
} |
- if (len >= ARRAY_SIZE(buffer) - 1) |
+ if (len >= arraysize(buffer) - 1) |
return false; |
pathname.clear(); |
pathname.SetFolder(ToUtf8(buffer)); |
@@ -295,10 +296,10 @@ bool Win32Filesystem::CopyFile(const Pathname &old_path, |
bool Win32Filesystem::IsTemporaryPath(const Pathname& pathname) { |
TCHAR buffer[MAX_PATH + 1]; |
- if (!::GetTempPath(ARRAY_SIZE(buffer), buffer)) |
+ if (!::GetTempPath(arraysize(buffer), buffer)) |
return false; |
if (!IsCurrentProcessLowIntegrity() && |
- !::GetLongPathName(buffer, buffer, ARRAY_SIZE(buffer))) |
+ !::GetLongPathName(buffer, buffer, arraysize(buffer))) |
return false; |
return (::strnicmp(ToUtf16(pathname.pathname()).c_str(), |
buffer, strlen(buffer)) == 0); |
@@ -337,7 +338,7 @@ bool Win32Filesystem::GetFileTime(const Pathname& path, FileTimeType which, |
bool Win32Filesystem::GetAppPathname(Pathname* path) { |
TCHAR buffer[MAX_PATH + 1]; |
- if (0 == ::GetModuleFileName(NULL, buffer, ARRAY_SIZE(buffer))) |
+ if (0 == ::GetModuleFileName(NULL, buffer, arraysize(buffer))) |
return false; |
path->SetPathname(ToUtf8(buffer)); |
return true; |
@@ -351,20 +352,20 @@ bool Win32Filesystem::GetAppDataFolder(Pathname* path, bool per_user) { |
if (!::SHGetSpecialFolderPath(NULL, buffer, csidl, TRUE)) |
return false; |
if (!IsCurrentProcessLowIntegrity() && |
- !::GetLongPathName(buffer, buffer, ARRAY_SIZE(buffer))) |
+ !::GetLongPathName(buffer, buffer, arraysize(buffer))) |
return false; |
- size_t len = strcatn(buffer, ARRAY_SIZE(buffer), __T("\\")); |
- len += strcpyn(buffer + len, ARRAY_SIZE(buffer) - len, |
+ size_t len = strcatn(buffer, arraysize(buffer), __T("\\")); |
+ len += strcpyn(buffer + len, arraysize(buffer) - len, |
ToUtf16(organization_name_).c_str()); |
if ((len > 0) && (buffer[len-1] != __T('\\'))) { |
- len += strcpyn(buffer + len, ARRAY_SIZE(buffer) - len, __T("\\")); |
+ len += strcpyn(buffer + len, arraysize(buffer) - len, __T("\\")); |
} |
- len += strcpyn(buffer + len, ARRAY_SIZE(buffer) - len, |
+ len += strcpyn(buffer + len, arraysize(buffer) - len, |
ToUtf16(application_name_).c_str()); |
if ((len > 0) && (buffer[len-1] != __T('\\'))) { |
- len += strcpyn(buffer + len, ARRAY_SIZE(buffer) - len, __T("\\")); |
+ len += strcpyn(buffer + len, arraysize(buffer) - len, __T("\\")); |
} |
- if (len >= ARRAY_SIZE(buffer) - 1) |
+ if (len >= arraysize(buffer) - 1) |
return false; |
path->clear(); |
path->SetFolder(ToUtf8(buffer)); |