Skip to content

Commit e4930be

Browse files
tkreuzertkreuzer
committed
[REACTOS] Use the ISO C and C++ conformant names: _wcsicmp, _stricmp
Stop using non-conforming wcsicmp, stricmp, strcasecmp
1 parent fb9571e commit e4930be

File tree

87 files changed

+293
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+293
-293
lines changed

‎base/applications/cmdutils/attrib/attrib.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ EnumFilesWorker(
243243
do
244244
{
245245
BOOL bIsDir = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
246-
BOOL bExactMatch = (wcsicmp(findFileName, EnumCtx->FileName) == 0);
246+
BOOL bExactMatch = (_wcsicmp(findFileName, EnumCtx->FileName) == 0);
247247

248248
if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && !bExactMatch)
249249
continue;
@@ -330,9 +330,9 @@ int wmain(int argc, WCHAR *argv[])
330330
}
331331
else
332332
/* Retrieve the enumeration modes */
333-
if (wcsicmp(argv[i], L"/s") == 0)
333+
if (_wcsicmp(argv[i], L"/s") == 0)
334334
dwEnumFlags |= ENUM_RECURSE;
335-
else if (wcsicmp(argv[i], L"/d") == 0)
335+
else if (_wcsicmp(argv[i], L"/d") == 0)
336336
dwEnumFlags |= ENUM_DIRECTORIES;
337337
else
338338
{

‎base/applications/cmdutils/doskey/doskey.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,37 +305,37 @@ wmain(VOID)
305305
{
306306
pszExeName = RemoveQuotes(pArgStart + 9);
307307
}
308-
else if (!wcsicmp(pArgStart, L"/H") ||
309-
!wcsicmp(pArgStart, L"/HISTORY"))
308+
else if (!_wcsicmp(pArgStart, L"/H") ||
309+
!_wcsicmp(pArgStart, L"/HISTORY"))
310310
{
311311
PrintHistory();
312312
}
313313
else if (!_wcsnicmp(pArgStart, L"/LISTSIZE=", 10))
314314
{
315315
SetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName);
316316
}
317-
else if (!wcsicmp(pArgStart, L"/REINSTALL"))
317+
else if (!_wcsicmp(pArgStart, L"/REINSTALL"))
318318
{
319319
ExpungeConsoleCommandHistoryW(pszExeName);
320320
}
321-
else if (!wcsicmp(pArgStart, L"/INSERT"))
321+
else if (!_wcsicmp(pArgStart, L"/INSERT"))
322322
{
323323
SetInsert(ENABLE_INSERT_MODE);
324324
}
325-
else if (!wcsicmp(pArgStart, L"/OVERSTRIKE"))
325+
else if (!_wcsicmp(pArgStart, L"/OVERSTRIKE"))
326326
{
327327
SetInsert(0);
328328
}
329-
else if (!wcsicmp(pArgStart, L"/M") ||
330-
!wcsicmp(pArgStart, L"/MACROS"))
329+
else if (!_wcsicmp(pArgStart, L"/M") ||
330+
!_wcsicmp(pArgStart, L"/MACROS"))
331331
{
332332
PrintMacros(pszExeName, L"");
333333
}
334334
else if (!_wcsnicmp(pArgStart, L"/M:", 3) ||
335335
!_wcsnicmp(pArgStart, L"/MACROS:", 8))
336336
{
337337
LPWSTR exe = RemoveQuotes(wcschr(pArgStart, L':') + 1);
338-
if (!wcsicmp(exe, L"ALL"))
338+
if (!_wcsicmp(exe, L"ALL"))
339339
PrintAllMacros();
340340
else
341341
PrintMacros(exe, L"");

‎base/applications/cmdutils/hostname/hostname.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int wmain(int argc, WCHAR* argv[])
5656
}
5757
else
5858
{
59-
if ((wcsicmp(argv[1], L"-s") == 0) || (wcsicmp(argv[1], L"/s") == 0))
59+
if ((_wcsicmp(argv[1], L"-s") == 0) || (_wcsicmp(argv[1], L"/s") == 0))
6060
{
6161
/* The program doesn't allow the user to set the host name */
6262
LoadStringW(GetModuleHandle(NULL), IDS_NOSET, Msg, _countof(Msg));

‎base/applications/cmdutils/whoami/whoami.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ BOOL GetArgument(WCHAR* arg, int argc, WCHAR* argv[])
3939

4040
for (i = 1; i < argc; i++)
4141
{
42-
if (wcsicmp(argv[i], arg) == 0)
42+
if (_wcsicmp(argv[i], arg) == 0)
4343
return TRUE;
4444
}
4545

@@ -698,7 +698,7 @@ int wmain(int argc, WCHAR* argv[])
698698
/* first things first-- let's detect and manage both printing modifiers (/fo and /nh) */
699699
for (i = 1; i < argc; i++)
700700
{
701-
if (wcsicmp(argv[i], L"/nh") == 0)
701+
if (_wcsicmp(argv[i], L"/nh") == 0)
702702
{
703703
NoHeaderArgCount++;
704704

@@ -713,22 +713,22 @@ int wmain(int argc, WCHAR* argv[])
713713

714714
for (i = 1; i < argc; i++)
715715
{
716-
if (wcsicmp(argv[i], L"/fo") == 0)
716+
if (_wcsicmp(argv[i], L"/fo") == 0)
717717
{
718718
if ((i + 1) < argc)
719719
{
720720
// wprintf(L"exists another param after /fo\n");
721721

722722
PrintFormatArgCount++;
723723

724-
if (wcsicmp(argv[i + 1], L"table") == 0 && PrintFormat != table)
724+
if (_wcsicmp(argv[i + 1], L"table") == 0 && PrintFormat != table)
725725
{
726726
PrintFormat = table;
727727
// wprintf(L"Changed to table format\n");
728728
BlankArgument(i, argv);
729729
BlankArgument(i + 1, argv);
730730
}
731-
else if (wcsicmp(argv[i + 1], L"list") == 0 && PrintFormat != list)
731+
else if (_wcsicmp(argv[i + 1], L"list") == 0 && PrintFormat != list)
732732
{
733733
PrintFormat = list;
734734
// wprintf(L"Changed to list format\n");
@@ -743,22 +743,22 @@ int wmain(int argc, WCHAR* argv[])
743743
return 1;
744744
}
745745
}
746-
else if (wcsicmp(argv[i + 1], L"csv") == 0 && PrintFormat != csv)
746+
else if (_wcsicmp(argv[i + 1], L"csv") == 0 && PrintFormat != csv)
747747
{
748748
PrintFormat = csv;
749749
// wprintf(L"Changed to csv format\n");
750750
BlankArgument(i, argv);
751751
BlankArgument(i + 1, argv);
752752
}
753753
/* /nh or /fo after /fo isn't parsed as a value */
754-
else if (wcsicmp(argv[i + 1], L"/nh") == 0 || wcsicmp(argv[i + 1], L"/fo") == 0
754+
else if (_wcsicmp(argv[i + 1], L"/nh") == 0 || _wcsicmp(argv[i + 1], L"/fo") == 0
755755

756756
/* same goes for the other named options, not ideal, but works */
757-
|| wcsicmp(argv[i + 1], L"/priv") == 0
758-
|| wcsicmp(argv[i + 1], L"/groups") == 0
759-
|| wcsicmp(argv[i + 1], L"/user") == 0
760-
|| wcsicmp(argv[i + 1], L"/all") == 0
761-
|| wcsicmp(argv[i + 1], L"") == 0)
757+
|| _wcsicmp(argv[i + 1], L"/priv") == 0
758+
|| _wcsicmp(argv[i + 1], L"/groups") == 0
759+
|| _wcsicmp(argv[i + 1], L"/user") == 0
760+
|| _wcsicmp(argv[i + 1], L"/all") == 0
761+
|| _wcsicmp(argv[i + 1], L"") == 0)
762762
{
763763
goto FoValueExpected;
764764
}
@@ -806,13 +806,13 @@ int wmain(int argc, WCHAR* argv[])
806806
if (argc == 2)
807807
{
808808
/* now let's try to parse the triumvirate of simpler, single (1) arguments... plus help */
809-
if (wcsicmp(argv[1], L"/?") == 0)
809+
if (_wcsicmp(argv[1], L"/?") == 0)
810810
{
811811
wprintf(WhoamiLoadRcString(IDS_HELP));
812812
return 0;
813813
}
814814

815-
else if (wcsicmp(argv[1], L"/upn") == 0)
815+
else if (_wcsicmp(argv[1], L"/upn") == 0)
816816
{
817817
LPWSTR UserBuffer = WhoamiGetUser(NameUserPrincipal);
818818

@@ -829,7 +829,7 @@ int wmain(int argc, WCHAR* argv[])
829829
}
830830
}
831831

832-
else if (wcsicmp(argv[1], L"/fqdn") == 0)
832+
else if (_wcsicmp(argv[1], L"/fqdn") == 0)
833833
{
834834
LPWSTR UserBuffer = WhoamiGetUser(NameFullyQualifiedDN);
835835

@@ -846,7 +846,7 @@ int wmain(int argc, WCHAR* argv[])
846846
}
847847
}
848848

849-
else if (wcsicmp(argv[1], L"/logonid") == 0)
849+
else if (_wcsicmp(argv[1], L"/logonid") == 0)
850850
{
851851
return WhoamiLogonId();
852852
}
@@ -858,11 +858,11 @@ int wmain(int argc, WCHAR* argv[])
858858
/* sometimes is just easier to whitelist for lack of a better method */
859859
for (i=1; i<argc; i++)
860860
{
861-
if ((wcsicmp(argv[i], L"/user") != 0) &&
862-
(wcsicmp(argv[i], L"/groups") != 0) &&
863-
(wcsicmp(argv[i], L"/priv") != 0) &&
864-
(wcsicmp(argv[i], L"/all") != 0) &&
865-
(wcsicmp(argv[i], L"") != 0))
861+
if ((_wcsicmp(argv[i], L"/user") != 0) &&
862+
(_wcsicmp(argv[i], L"/groups") != 0) &&
863+
(_wcsicmp(argv[i], L"/priv") != 0) &&
864+
(_wcsicmp(argv[i], L"/all") != 0) &&
865+
(_wcsicmp(argv[i], L"") != 0))
866866
{
867867
wprintf(WhoamiLoadRcString(IDS_ERROR_INVALIDARG), argv[i]);
868868
return 1;

‎base/applications/mscutils/eventvwr/eventvwr.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,7 @@ FilterByString(IN PCWSTR FilterString, // This is a multi-string
19361936
pStr = FilterString;
19371937
while (*pStr)
19381938
{
1939-
if (wcsicmp(pStr, String) == 0)
1939+
if (_wcsicmp(pStr, String) == 0)
19401940
{
19411941
/* We have a match, break the loop */
19421942
break;
@@ -2955,7 +2955,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName)
29552955
for (lpcName = 0; lpcName < ARRAYSIZE(SystemLogs); ++lpcName)
29562956
{
29572957
/* Check whether the log name is part of the system logs */
2958-
if (wcsicmp(LogName, SystemLogs[lpcName]) == 0)
2958+
if (_wcsicmp(LogName, SystemLogs[lpcName]) == 0)
29592959
{
29602960
hRootNode = htiSystemLogs;
29612961
break;
@@ -2967,7 +2967,7 @@ BuildLogListAndFilterList(IN LPCWSTR lpComputerName)
29672967
2, 3, (LPARAM)EventLogFilter);
29682968

29692969
/* Try to get the default event log: "Application" */
2970-
if ((hItemDefault == NULL) && (wcsicmp(LogName, SystemLogs[0]) == 0))
2970+
if ((hItemDefault == NULL) && (_wcsicmp(LogName, SystemLogs[0]) == 0))
29712971
{
29722972
hItemDefault = hItem;
29732973
}

‎base/applications/network/net/cmdAccounts.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ cmdAccounts(
7070
if (_wcsnicmp(argv[i], L"/forcelogoff:", 13) == 0)
7171
{
7272
p = &argv[i][13];
73-
if (wcsicmp(p, L"no") == 0)
73+
if (_wcsicmp(p, L"no") == 0)
7474
{
7575
Info0->usrmod0_force_logoff = TIMEQ_FOREVER;
7676
Modified = TRUE;
@@ -107,7 +107,7 @@ cmdAccounts(
107107
{
108108
p = &argv[i][10];
109109

110-
if (wcsicmp(p, L"unlimited"))
110+
if (_wcsicmp(p, L"unlimited"))
111111
{
112112
Info0->usrmod0_max_passwd_age = ULONG_MAX;
113113
Modified = TRUE;

‎base/applications/network/net/cmdUse.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ EnumerateConnections(LPCWSTR Local)
4747
lpCur = lpRes;
4848
for (; dCount; dCount--)
4949
{
50-
if (!Local || wcsicmp(lpCur->lpLocalName, Local) == 0)
50+
if (!Local || _wcsicmp(lpCur->lpLocalName, Local) == 0)
5151
{
5252
ConPrintf(StdOut, L"%s\t\t\t%s\t\t%s\n", lpCur->lpLocalName, lpCur->lpRemoteName, lpCur->lpProvider);
5353
}
@@ -135,7 +135,7 @@ cmdUse(
135135
}
136136

137137
Delete = 0;
138-
if (wcsicmp(argv[2], L"/DELETE") == 0)
138+
if (_wcsicmp(argv[2], L"/DELETE") == 0)
139139
{
140140
Delete = 3;
141141
}
@@ -149,7 +149,7 @@ cmdUse(
149149
}
150150
}
151151

152-
if (wcsicmp(argv[3], L"/DELETE") == 0)
152+
if (_wcsicmp(argv[3], L"/DELETE") == 0)
153153
{
154154
Delete = 2;
155155
}

‎base/applications/network/net/cmdUser.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ ParseLogonHours(
962962
goto done;
963963
}
964964

965-
if (wcsicmp(pszParams, L"all") == 0)
965+
if (_wcsicmp(pszParams, L"all") == 0)
966966
{
967967
FillMemory(pLogonBitmap, UNITS_PER_WEEK / 8, 0xFF);
968968
goto done;

‎base/applications/network/netsh/interpreter.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ InterpretCommand(
3636
return FALSE;
3737
}
3838

39-
if ((wcsicmp(argv[dwArgCount - 1], L"?") == 0) ||
40-
(wcsicmp(argv[dwArgCount - 1], L"help") == 0))
39+
if ((_wcsicmp(argv[dwArgCount - 1], L"?") == 0) ||
40+
(_wcsicmp(argv[dwArgCount - 1], L"help") == 0))
4141
{
4242
dwHelpLevel = dwArgCount - 1;
4343
}
@@ -49,7 +49,7 @@ InterpretCommand(
4949
pCommand = pContext->pCommandListHead;
5050
while (pCommand != NULL)
5151
{
52-
if (wcsicmp(argv[0], pCommand->pwszCmdToken) == 0)
52+
if (_wcsicmp(argv[0], pCommand->pwszCmdToken) == 0)
5353
{
5454
if (dwHelpLevel == 1)
5555
{
@@ -74,7 +74,7 @@ InterpretCommand(
7474
pGroup = pContext->pGroupListHead;
7575
while (pGroup != NULL)
7676
{
77-
if (wcsicmp(argv[0], pGroup->pwszCmdGroupToken) == 0)
77+
if (_wcsicmp(argv[0], pGroup->pwszCmdGroupToken) == 0)
7878
{
7979
if (dwHelpLevel == 1)
8080
{
@@ -85,7 +85,7 @@ InterpretCommand(
8585
pCommand = pGroup->pCommandListHead;
8686
while (pCommand != NULL)
8787
{
88-
if ((dwArgCount > 1) && (wcsicmp(argv[1], pCommand->pwszCmdToken) == 0))
88+
if ((dwArgCount > 1) && (_wcsicmp(argv[1], pCommand->pwszCmdToken) == 0))
8989
{
9090
if (dwHelpLevel == 2)
9191
{
@@ -120,7 +120,7 @@ InterpretCommand(
120120
pSubContext = pContext->pSubContextHead;
121121
while (pSubContext != NULL)
122122
{
123-
if (wcsicmp(argv[0], pSubContext->pszContextName) == 0)
123+
if (_wcsicmp(argv[0], pSubContext->pszContextName) == 0)
124124
{
125125
pCurrentContext = pSubContext;
126126
return TRUE;

‎base/applications/network/netsh/netsh.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ MatchToken(
212212
_In_ LPCWSTR pwszCmdToken)
213213
{
214214
DPRINT1("MatchToken %S %S\n", pwszUserToken, pwszCmdToken);
215-
return (wcsicmp(pwszUserToken, pwszCmdToken) == 0) ? TRUE : FALSE;
215+
return (_wcsicmp(pwszUserToken, pwszCmdToken) == 0) ? TRUE : FALSE;
216216
}
217217

218218
DWORD

0 commit comments

Comments
 (0)