Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit b49116c

Browse files
adityamandaleekaadityamandaleeka
authored
Merge pull request #6521 from adityamandaleeka/remove_internal_free
Remove CorUnix::InternalFree from PAL
2 parents 70769b7 + e545b22 commit b49116c

File tree

22 files changed

+139
-153
lines changed

22 files changed

+139
-153
lines changed

‎src/pal/src/cruntime/malloc.cpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ CorUnix::InternalRealloc(
5757
// If pvMemblock is NULL, there's no reason to call free.
5858
if (pvMemblock != NULL)
5959
{
60-
InternalFree(pvMemblock);
60+
free(pvMemblock);
6161
}
6262
pvMem = NULL;
6363
}
@@ -76,14 +76,6 @@ __cdecl
7676
PAL_free(
7777
void *pvMem
7878
)
79-
{
80-
InternalFree(pvMem);
81-
}
82-
83-
void
84-
CorUnix::InternalFree(
85-
void *pvMem
86-
)
8779
{
8880
free(pvMem);
8981
}

‎src/pal/src/cruntime/printfcpp.cpp‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@ static int Internal_Convertfwrite(CPalThread *pthrCurrent, const void *buffer, s
8080
if (!nsize)
8181
{
8282
ASSERT("WideCharToMultiByte failed. Error is %d\n", GetLastError());
83-
InternalFree(newBuff);
83+
free(newBuff);
8484
return -1;
8585
}
8686
ret = InternalFwrite(newBuff, 1, count, stream, &iError);
8787
if (iError != 0)
8888
{
8989
ERROR("InternalFwrite did not write the whole buffer. Error is %d\n", iError);
90-
InternalFree(newBuff);
90+
free(newBuff);
9191
return -1;
9292
}
93-
InternalFree(newBuff);
93+
free(newBuff);
9494
}
9595
else
9696
{
@@ -441,7 +441,7 @@ BOOL Internal_ExtractFormatA(CPalThread *pthrCurrent, LPCSTR *Fmt, LPSTR Out, LP
441441
}
442442

443443
*Out = 0; /* end the string */
444-
InternalFree(TempStr);
444+
free(TempStr);
445445
return Result;
446446
}
447447

@@ -769,7 +769,7 @@ BOOL Internal_ExtractFormatW(CPalThread *pthrCurrent, LPCWSTR *Fmt, LPSTR Out, L
769769
}
770770

771771
*Out = 0; /* end the string */
772-
InternalFree(TempStr);
772+
free(TempStr);
773773
return Result;
774774
}
775775

@@ -947,7 +947,7 @@ INT Internal_AddPaddingVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, LPSTR
947947
}
948948

949949
Done:
950-
InternalFree(OutOriginal);
950+
free(OutOriginal);
951951

952952
return Written;
953953
}
@@ -998,7 +998,7 @@ static INT Internal_AddPaddingVfwprintf(CPalThread *pthrCurrent, PAL_FILE *strea
998998
if (wcscpy_s(Out, iLen, In) != SAFECRT_SUCCESS)
999999
{
10001000
ERROR("wcscpy_s failed!\n");
1001-
InternalFree(OutOriginal);
1001+
free(OutOriginal);
10021002
pthrCurrent->SetLastError(ERROR_INSUFFICIENT_BUFFER);
10031003
return -1;
10041004
}
@@ -1028,7 +1028,7 @@ static INT Internal_AddPaddingVfwprintf(CPalThread *pthrCurrent, PAL_FILE *strea
10281028
if (wcscpy_s(Out, iLen, In) != SAFECRT_SUCCESS)
10291029
{
10301030
ERROR("wcscpy_s failed!\n");
1031-
InternalFree(OutOriginal);
1031+
free(OutOriginal);
10321032
pthrCurrent->SetLastError(ERROR_INSUFFICIENT_BUFFER);
10331033
return -1;
10341034
}
@@ -1045,7 +1045,7 @@ static INT Internal_AddPaddingVfwprintf(CPalThread *pthrCurrent, PAL_FILE *strea
10451045
{
10461046
ERROR("fwrite() failed with errno == %d\n", errno);
10471047
}
1048-
InternalFree(OutOriginal);
1048+
free(OutOriginal);
10491049
}
10501050

10511051
return Written;
@@ -1265,7 +1265,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for
12651265
pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY);
12661266
if (WStrWasMalloced)
12671267
{
1268-
InternalFree(TempWStr);
1268+
free(TempWStr);
12691269
}
12701270
va_end(ap);
12711271
return -1;
@@ -1283,9 +1283,9 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for
12831283
ERROR("Internal_AddPaddingVfwprintf failed\n");
12841284
if (WStrWasMalloced)
12851285
{
1286-
InternalFree(TempWStr);
1286+
free(TempWStr);
12871287
}
1288-
InternalFree(WorkingWStr);
1288+
free(WorkingWStr);
12891289
LOGEXIT("wcsncpy_s failed!\n");
12901290
PERF_EXIT(vfwprintf);
12911291
va_end(ap);
@@ -1312,20 +1312,20 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for
13121312
ERROR("Internal_AddPaddingVfwprintf failed\n");
13131313
if (WStrWasMalloced)
13141314
{
1315-
InternalFree(TempWStr);
1315+
free(TempWStr);
13161316
}
1317-
InternalFree(WorkingWStr);
1317+
free(WorkingWStr);
13181318
LOGEXIT("vfwprintf returns int -1\n");
13191319
PERF_EXIT(vfwprintf);
13201320
va_end(ap);
13211321
return (-1);
13221322
}
13231323
written += paddingReturnValue;
13241324

1325-
InternalFree(WorkingWStr);
1325+
free(WorkingWStr);
13261326
if (WStrWasMalloced)
13271327
{
1328-
InternalFree(TempWStr);
1328+
free(TempWStr);
13291329
}
13301330
}
13311331
else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR)
@@ -1499,7 +1499,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for
14991499
ERROR("MultiByteToWideChar failed\n");
15001500
if(TempSprintfStrPtr)
15011501
{
1502-
InternalFree(TempSprintfStrPtr);
1502+
free(TempSprintfStrPtr);
15031503
}
15041504
LOGEXIT("vfwprintf returns int -1\n");
15051505
PERF_EXIT(vfwprintf);
@@ -1516,7 +1516,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for
15161516
pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY);
15171517
if(TempSprintfStrPtr)
15181518
{
1519-
InternalFree(TempSprintfStrPtr);
1519+
free(TempSprintfStrPtr);
15201520
}
15211521
va_end(ap);
15221522
return -1;
@@ -1538,19 +1538,19 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for
15381538
ERROR("fwrite() failed with errno == %d (%s)\n", errno, strerror(errno));
15391539
LOGEXIT("vfwprintf returns int -1\n");
15401540
PERF_EXIT(vfwprintf);
1541-
InternalFree(TempWideBuffer);
1541+
free(TempWideBuffer);
15421542
if(TempSprintfStrPtr)
15431543
{
1544-
InternalFree(TempSprintfStrPtr);
1544+
free(TempSprintfStrPtr);
15451545
}
15461546
va_end(ap);
15471547
return -1;
15481548
}
15491549
if(TempSprintfStrPtr)
15501550
{
1551-
InternalFree(TempSprintfStrPtr);
1551+
free(TempSprintfStrPtr);
15521552
}
1553-
InternalFree(TempWideBuffer);
1553+
free(TempWideBuffer);
15541554
}
15551555
}
15561556
else
@@ -1669,7 +1669,7 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo
16691669
{
16701670
ASSERT("WideCharToMultiByte failed. Error is %d\n",
16711671
GetLastError());
1672-
InternalFree(TempStr);
1672+
free(TempStr);
16731673
va_end(ap);
16741674
return -1;
16751675
}
@@ -1685,7 +1685,7 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo
16851685
{
16861686
ASSERT("WideCharToMultiByte failed. Error is %d\n",
16871687
GetLastError());
1688-
InternalFree(TempStr);
1688+
free(TempStr);
16891689
va_end(ap);
16901690
return -1;
16911691
}
@@ -1699,7 +1699,7 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo
16991699
Width - Length,
17001700
Flags);
17011701

1702-
InternalFree(TempStr);
1702+
free(TempStr);
17031703
}
17041704
else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR)
17051705
{
@@ -1986,7 +1986,7 @@ int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR
19861986
pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY);
19871987
if (needToFree)
19881988
{
1989-
InternalFree(TempWStr);
1989+
free(TempWStr);
19901990
}
19911991
va_end(ap);
19921992
return -1;
@@ -2004,9 +2004,9 @@ int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR
20042004
ERROR("CoreWvsnprintf failed\n");
20052005
if (needToFree)
20062006
{
2007-
InternalFree(TempWStr);
2007+
free(TempWStr);
20082008
}
2009-
InternalFree(WorkingWStr);
2009+
free(WorkingWStr);
20102010
LOGEXIT("wcsncpy_s failed!\n");
20112011
PERF_EXIT(wvsnprintf);
20122012
va_end(ap);
@@ -2030,9 +2030,9 @@ int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR
20302030

20312031
if (needToFree)
20322032
{
2033-
InternalFree(TempWStr);
2033+
free(TempWStr);
20342034
}
2035-
InternalFree(WorkingWStr);
2035+
free(WorkingWStr);
20362036
}
20372037
else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR)
20382038
{
@@ -2159,7 +2159,7 @@ int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR
21592159
if (strncpy_s(TempNumberBuffer, TempCount+1, (LPSTR) BufferPtr, TempCount) != SAFECRT_SUCCESS)
21602160
{
21612161
ASSERT("strncpy_s failed!\n");
2162-
InternalFree(TempNumberBuffer);
2162+
free(TempNumberBuffer);
21632163
va_end(ap);
21642164
return -1;
21652165
}
@@ -2172,7 +2172,7 @@ int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR
21722172
{
21732173
ASSERT("MultiByteToWideChar failed. Error is %d\n",
21742174
GetLastError());
2175-
InternalFree(TempNumberBuffer);
2175+
free(TempNumberBuffer);
21762176
va_end(ap);
21772177
return -1;
21782178
}
@@ -2193,7 +2193,7 @@ int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR
21932193
if (strncpy_s(TempNumberBuffer, TempInt+1, (LPSTR) BufferPtr, TempInt) != SAFECRT_SUCCESS)
21942194
{
21952195
ASSERT("strncpy_s failed!\n");
2196-
InternalFree(TempNumberBuffer);
2196+
free(TempNumberBuffer);
21972197
va_end(ap);
21982198
return -1;
21992199
}
@@ -2206,13 +2206,13 @@ int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR
22062206
{
22072207
ASSERT("MultiByteToWideChar failed. Error is %d\n",
22082208
GetLastError());
2209-
InternalFree(TempNumberBuffer);
2209+
free(TempNumberBuffer);
22102210
va_end(ap);
22112211
return -1;
22122212
}
22132213
BufferPtr += TempInt;
22142214
}
2215-
InternalFree(TempNumberBuffer);
2215+
free(TempNumberBuffer);
22162216
}
22172217
}
22182218
else
@@ -2326,7 +2326,7 @@ int CoreVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format,
23262326
{
23272327
ASSERT("WideCharToMultiByte failed. Error is %d\n",
23282328
GetLastError());
2329-
InternalFree(TempStr);
2329+
free(TempStr);
23302330
PERF_EXIT(vfprintf);
23312331
va_end(ap);
23322332
return -1;
@@ -2343,7 +2343,7 @@ int CoreVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format,
23432343
{
23442344
ASSERT("WideCharToMultiByte failed. Error is %d\n",
23452345
GetLastError());
2346-
InternalFree(TempStr);
2346+
free(TempStr);
23472347
PERF_EXIT(vfprintf);
23482348
va_end(ap);
23492349
return -1;
@@ -2358,14 +2358,14 @@ int CoreVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format,
23582358
if (-1 == paddingReturnValue)
23592359
{
23602360
ERROR("Internal_AddPaddingVfprintf failed\n");
2361-
InternalFree(TempStr);
2361+
free(TempStr);
23622362
PERF_EXIT(vfprintf);
23632363
va_end(ap);
23642364
return -1;
23652365
}
23662366
written += paddingReturnValue;
23672367

2368-
InternalFree(TempStr);
2368+
free(TempStr);
23692369
}
23702370
else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR)
23712371
{

‎src/pal/src/debug/debug.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ OutputDebugStringW(
236236
{
237237
ASSERT("failed to convert wide chars to multibytes\n");
238238
SetLastError(ERROR_INTERNAL_ERROR);
239-
InternalFree(lpOutputStringA);
239+
free(lpOutputStringA);
240240
goto EXIT;
241241
}
242242

243243
OutputDebugStringA(lpOutputStringA);
244-
InternalFree(lpOutputStringA);
244+
free(lpOutputStringA);
245245

246246
EXIT:
247247
LOGEXIT("OutputDebugStringW returns\n");
@@ -388,7 +388,7 @@ DebugBreakCommand()
388388
goto FAILED;
389389
}
390390

391-
InternalFree(command_string);
391+
free(command_string);
392392
return 1;
393393
}
394394

@@ -397,7 +397,7 @@ DebugBreakCommand()
397397
FAILED:
398398
if (command_string)
399399
{
400-
InternalFree(command_string);
400+
free(command_string);
401401
}
402402

403403
fprintf (stderr, "Failed to execute command: '%s'\n", command_string);
@@ -1519,7 +1519,7 @@ ReadProcessMemory(
15191519
CLEANUP2:
15201520
if (lpTmpBuffer)
15211521
{
1522-
InternalFree(lpTmpBuffer);
1522+
free(lpTmpBuffer);
15231523
}
15241524
#endif // !HAVE_TTRACE
15251525

@@ -1816,7 +1816,7 @@ WriteProcessMemory(
18161816
CLEANUP2:
18171817
if (lpTmpBuffer)
18181818
{
1819-
InternalFree(lpTmpBuffer);
1819+
free(lpTmpBuffer);
18201820
}
18211821
#endif // !HAVE_TTRACE
18221822

‎src/pal/src/exception/machexception.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ GetExceptionMask()
177177
if (exceptionSettings)
178178
{
179179
exMode = (MachExceptionMode)atoi(exceptionSettings);
180-
InternalFree(exceptionSettings);
180+
free(exceptionSettings);
181181
}
182182
else
183183
{

0 commit comments

Comments
 (0)