Zebediah Figura : kernelbase: Use wcsnlen().
Module: wine Branch: master Commit: 628f2a1e565ea1d539f8ec37a029c66d0f54bacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=628f2a1e565ea1d539f8ec37a... Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 20:39:56 2022 -0600 kernelbase: Use wcsnlen(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b4b31410a3a..3503286a82a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -105,15 +105,6 @@ static WCHAR *heap_strdupAtoW(const char *str) return ret; } -static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) -{ - SIZE_T i; - - for (i = 0; i < maxlen; i++) - if (!string[i]) break; - return i; -} - static BOOL is_drive_spec( const WCHAR *str ) { return ((str[0] >= 'A' && str[0] <= 'Z') || (str[0] >= 'a' && str[0] <= 'z')) && str[1] == ':'; @@ -517,7 +508,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens if (FAILED(hr)) return hr; if (*existing_extension) return S_FALSE; - path_length = strnlenW(path, size); + path_length = wcsnlen(path, size); dot_length = has_dot ? 0 : 1; extension_length = lstrlenW(extension); @@ -752,7 +743,7 @@ HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **p return E_INVALIDARG; } - path_length = strnlenW(path, path_size); + path_length = wcsnlen(path, path_size); if (path_length == path_size && !path[path_length]) return E_INVALIDARG; root_end = get_root_end(path);
participants (1)
-
Alexandre Julliard