Skip to content

win32/win32.c: silence the rest of the gcc warnings #22066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2024
Merged

win32/win32.c: silence the rest of the gcc warnings #22066

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4625592
win32.c: suppress -Wcast-function-type warnings
tonycoz Mar 6, 2024
eb7f897
win32.c: don't call wcscpy() with in == out
tonycoz Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion win32/win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3700,6 +3700,17 @@ win32_pclose(PerlIO *pf)
#endif /* USE_RTL_POPEN */
}

/* wcscpy() arguments are restrict qualified, but if they're equal
we don't need to do the copy
*/
static inline WCHAR *
cond_wcsncpy(WCHAR *out, const WCHAR *in, size_t n) {
assert(wcslen(in) < n);
if (out != in)
wcsncpy(out, in, n);
return out;
}

DllExport int
win32_link(const char *oldname, const char *newname)
{
Expand All @@ -3709,7 +3720,8 @@ win32_link(const char *oldname, const char *newname)

if (MultiByteToWideChar(CP_ACP, 0, oldname, -1, wOldName, MAX_PATH+1) &&
MultiByteToWideChar(CP_ACP, 0, newname, -1, wNewName, MAX_PATH+1) &&
((aTHXa(PERL_GET_THX)), wcscpy(wOldName, PerlDir_mapW(wOldName)),
((aTHXa(PERL_GET_THX)),
cond_wcsncpy(wOldName, PerlDir_mapW(wOldName), C_ARRAY_LENGTH(wOldName)),
CreateHardLinkW(PerlDir_mapW(wNewName), wOldName, NULL)))
{
return 0;
Expand All @@ -3733,8 +3745,10 @@ win32_symlink(const char *oldfile, const char *newfile)
{
dTHX;
size_t oldfile_len = strlen(oldfile);
GCC_DIAG_IGNORE_DECL(-Wcast-function-type);
pCreateSymbolicLinkA_t pCreateSymbolicLinkA =
(pCreateSymbolicLinkA_t)GetProcAddress(GetModuleHandle("kernel32.dll"), "CreateSymbolicLinkA");
GCC_DIAG_RESTORE_DECL;
DWORD create_flags = 0;

/* this flag can be used only on Windows 10 1703 or newer */
Expand Down Expand Up @@ -5043,7 +5057,9 @@ Perl_init_os_extras(void)
HMODULE module = (HMODULE)((w32_perldll_handle == INVALID_HANDLE_VALUE)
? GetModuleHandle(NULL)
: w32_perldll_handle);
GCC_DIAG_IGNORE_DECL(-Wcast-function-type);
pfn_init = (void (*)(pTHX))GetProcAddress(module, "init_Win32CORE");
GCC_DIAG_RESTORE_DECL;
aTHXa(PERL_GET_THX);
if (pfn_init)
pfn_init(aTHX);
Expand Down