admin/fancycode-MemoryModule
1
0
Fork 0
mirror of https://github.com/fancycode/MemoryModule synced 2026-06-06 15:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use "size_t" instead of "long" for sizes.

Browse Source
This commit is contained in:
Joachim Bauch
2016-09-20 01:03:54 +02:00
parent 4074f1e6ab
commit 49a82873f7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/DllLoader/DllLoader.cpp
+10 -10
View File
@@ -46,8 +46,8 @@ void LoadFromFile(void)
FreeLibrary(handle); FreeLibrary(handle);
} }
void* ReadLibrary(long* pSize) { void* ReadLibrary(size_t* pSize) {
long read; size_t read;
void* result; void* result;
FILE* fp; FILE* fp;
@@ -59,8 +59,8 @@ void* ReadLibrary(long* pSize) {
} }
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
*pSize = ftell(fp); *pSize = static_cast<size_t>(ftell(fp));
if (*pSize < 0) if (*pSize == 0)
{ {
fclose(fp); fclose(fp);
return NULL; return NULL;
@@ -75,7 +75,7 @@ void* ReadLibrary(long* pSize) {
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
read = fread(result, 1, *pSize, fp); read = fread(result, 1, *pSize, fp);
fclose(fp); fclose(fp);
if (read != static_cast<size_t>(*pSize)) if (read != *pSize)
{ {
free(result); free(result);
return NULL; return NULL;
@@ -87,7 +87,7 @@ void* ReadLibrary(long* pSize) {
void LoadFromMemory(void) void LoadFromMemory(void)
{ {
void *data; void *data;
long size; size_t size;
HMEMORYMODULE handle; HMEMORYMODULE handle;
addNumberProc addNumber; addNumberProc addNumber;
HMEMORYRSRC resourceInfo; HMEMORYRSRC resourceInfo;
@@ -195,7 +195,7 @@ void InitFreeFunc(CallList* calls, CustomFreeFunc freeFunc) {
calls->current_free_call = 0; calls->current_free_call = 0;
} }
void TestFailingAllocation(void *data, long size) { void TestFailingAllocation(void *data, size_t size) {
CallList expected_calls; CallList expected_calls;
HMEMORYMODULE handle; HMEMORYMODULE handle;
@@ -214,7 +214,7 @@ void TestFailingAllocation(void *data, long size) {
assert(expected_calls.current_free_call == 0); assert(expected_calls.current_free_call == 0);
} }
void TestCleanupAfterFailingAllocation(void *data, long size) { void TestCleanupAfterFailingAllocation(void *data, size_t size) {
CallList expected_calls; CallList expected_calls;
HMEMORYMODULE handle; HMEMORYMODULE handle;
int free_calls_after_loading; int free_calls_after_loading;
@@ -238,7 +238,7 @@ void TestCleanupAfterFailingAllocation(void *data, long size) {
assert(expected_calls.current_free_call == free_calls_after_loading); assert(expected_calls.current_free_call == free_calls_after_loading);
} }
void TestFreeAfterDefaultAlloc(void *data, long size) { void TestFreeAfterDefaultAlloc(void *data, size_t size) {
CallList expected_calls; CallList expected_calls;
HMEMORYMODULE handle; HMEMORYMODULE handle;
int free_calls_after_loading; int free_calls_after_loading;
@@ -260,7 +260,7 @@ void TestFreeAfterDefaultAlloc(void *data, long size) {
void TestCustomAllocAndFree(void) void TestCustomAllocAndFree(void)
{ {
void *data; void *data;
long size; size_t size;
data = ReadLibrary(&size); data = ReadLibrary(&size);
if (data == NULL) if (data == NULL)