Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-09-20 01:11:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[common] use variable-relative sizeof where possible

Browse Source
This commit is contained in:
Tudor Brindus 2021-08-15 12:18:12 -04:00 committed by Geoffrey McRae
parent 982b4e6625
commit 1c5620ba25
11 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/countedbuffer.c
View File

@ -24,7 +24,7 @@
struct CountedBuffer * countedBufferNew(size_t size)
{
struct CountedBuffer * buffer = malloc(sizeof(struct CountedBuffer) + size);
struct CountedBuffer * buffer = malloc(sizeof(*buffer) + size);
if (!buffer)
return NULL;

12
common/src/option.c
View File

@ -120,14 +120,14 @@ bool option_register(struct Option options[])
state.options = realloc(
state.options,
sizeof(struct Option *) * (state.oCount + new)
sizeof(*state.options) * (state.oCount + new)
);
for(int i = 0; options[i].type != OPTION_TYPE_NONE; ++i)
{
state.options[state.oCount + i] = (struct Option *)malloc(sizeof(struct Option));
state.options[state.oCount + i] = (struct Option *)malloc(sizeof(**state.options));
struct Option * o = state.options[state.oCount + i];
memcpy(o, &options[i], sizeof(struct Option));
memcpy(o, &options[i], sizeof(*o));
if (!o->parser)
{
@ -199,7 +199,7 @@ bool option_register(struct Option options[])
found = true;
group->options = realloc(
group->options,
sizeof(struct Option *) * (group->count + 1)
sizeof(*group->options) * (group->count + 1)
);
group->options[group->count] = o;
@ -215,14 +215,14 @@ bool option_register(struct Option options[])
{
state.groups = realloc(
state.groups,
sizeof(struct OptionGroup) * (state.gCount + 1)
sizeof(*state.groups) * (state.gCount + 1)
);
struct OptionGroup * group = &state.groups[state.gCount];
++state.gCount;
group->module = o->module;
group->options = malloc(sizeof(struct Option *));
group->options = malloc(sizeof(*group->options));
group->options[0] = o;
group->count = 1;
group->pad = strlen(o->name);

2
common/src/platform/linux/crash.c
View File

@ -164,7 +164,7 @@ static int dl_iterate_phdr_callback(struct dl_phdr_info * info, size_t size, voi
ttl += hdr.p_memsz;
}
crash.ranges = realloc(crash.ranges, sizeof(struct range) * (crash.rangeCount + 1));
crash.ranges = realloc(crash.ranges, sizeof(*crash.ranges) * (crash.rangeCount + 1));
crash.ranges[crash.rangeCount].start = info->dlpi_addr;
crash.ranges[crash.rangeCount].end = info->dlpi_addr + ttl;
++crash.rangeCount;

2
common/src/platform/linux/event.c
View File

@ -39,7 +39,7 @@ struct LGEvent
LGEvent * lgCreateEvent(bool autoReset, unsigned int msSpinTime)
{
LGEvent * handle = (LGEvent *)calloc(sizeof(LGEvent), 1);
LGEvent * handle = (LGEvent *)calloc(sizeof(*handle), 1);
if (!handle)
{
DEBUG_ERROR("Failed to allocate memory");

3
common/src/platform/linux/ivshmem.c
View File

@ -171,8 +171,7 @@ bool ivshmemOpenDev(struct IVSHMEM * dev, const char * shmDevice)
return false;
}
struct IVSHMEMInfo * info =
(struct IVSHMEMInfo *)malloc(sizeof(struct IVSHMEMInfo));
struct IVSHMEMInfo * info = (struct IVSHMEMInfo *)malloc(sizeof(*info));
info->size = devSize;
info->devFd = devFd;
info->hasDMA = hasDMA;

2
common/src/platform/linux/thread.c
View File

@ -43,7 +43,7 @@ static void * threadWrapper(void * opaque)
bool lgCreateThread(const char * name, LGThreadFunction function, void * opaque, LGThread ** handle)
{
*handle = (LGThread*)malloc(sizeof(LGThread));
*handle = (LGThread*)malloc(sizeof(**handle));
(*handle)->name = name;
(*handle)->function = function;
(*handle)->opaque = opaque;

2
common/src/platform/linux/time.c
View File

@ -49,7 +49,7 @@ static void TimerProc(union sigval arg)
bool lgCreateTimer(const unsigned int intervalMS, LGTimerFn fn,
void * udata, LGTimer ** result)
{
LGTimer * ret = malloc(sizeof(LGTimer));
LGTimer * ret = malloc(sizeof(*ret));
if (!ret)
{

9
common/src/platform/windows/ivshmem.c
View File

@ -80,7 +80,7 @@ bool ivshmemInit(struct IVSHMEM * dev)
SP_DEVICE_INTERFACE_DATA devInterfaceData = {0};
int deviceAllocated = 1;
int deviceCount = 0;
struct IVSHMEMData * devices = malloc(sizeof(struct IVSHMEMData) * deviceAllocated);
struct IVSHMEMData * devices = malloc(sizeof(*devices) * deviceAllocated);
devInfoSet = SetupDiGetClassDevs(&GUID_DEVINTERFACE_IVSHMEM, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
@ -97,7 +97,7 @@ bool ivshmemInit(struct IVSHMEM * dev)
if (deviceCount >= deviceAllocated)
{
int newCount = deviceAllocated * 2;
void * new = realloc(devices, newCount * sizeof(struct IVSHMEMData));
struct IVSHMEMData * new = realloc(devices, newCount * sizeof(*new));
if (!new)
{
DEBUG_ERROR("Failed to allocate memory");
@ -133,7 +133,7 @@ bool ivshmemInit(struct IVSHMEM * dev)
}
const int shmDevice = option_get_int("os", "shmDevice");
qsort(devices, deviceCount, sizeof(struct IVSHMEMData), ivshmemComparator);
qsort(devices, deviceCount, sizeof(*devices), ivshmemComparator);
for (int i = 0; i < deviceCount; ++i)
{
@ -181,8 +181,7 @@ bool ivshmemInit(struct IVSHMEM * dev)
free(infData);
SetupDiDestroyDeviceInfoList(devInfoSet);
struct IVSHMEMInfo * info =
(struct IVSHMEMInfo *)malloc(sizeof(struct IVSHMEMInfo));
struct IVSHMEMInfo * info = (struct IVSHMEMInfo *)malloc(sizeof(*info));
info->handle = handle;
dev->opaque = info;

2
common/src/platform/windows/thread.c
View File

@ -44,7 +44,7 @@ static DWORD WINAPI threadWrapper(LPVOID lpParameter)
bool lgCreateThread(const char * name, LGThreadFunction function, void * opaque, LGThread ** handle)
{
*handle = (LGThread *)malloc(sizeof(LGThread));
*handle = (LGThread *)malloc(sizeof(**handle));
(*handle)->name = name;
(*handle)->function = function;
(*handle)->opaque = opaque;

2
common/src/platform/windows/time.c
View File

@ -45,7 +45,7 @@ static void TimerProc(HWND Arg1, UINT Arg2, UINT_PTR Arg3, DWORD Arg4)
bool lgCreateTimer(const unsigned int intervalMS, LGTimerFn fn,
void * udata, LGTimer ** result)
{
LGTimer * ret = malloc(sizeof(LGTimer));
LGTimer * ret = malloc(sizeof(*ret));
if (!ret)
{
DEBUG_ERROR("failed to malloc LGTimer struct");

4
common/src/stringlist.c
View File

@ -32,7 +32,7 @@ struct StringList
StringList stringlist_new(bool owns_strings)
{
StringList sl = malloc(sizeof(struct StringList));
StringList sl = malloc(sizeof(*sl));
sl->owns_strings = owns_strings;
sl->size = 32;
@ -58,7 +58,7 @@ int stringlist_push (StringList sl, char * str)
if (sl->count == sl->size)
{
sl->size += 32;
sl->list = realloc(sl->list, sizeof(char *) * sl->size);
sl->list = realloc(sl->list, sizeof(*sl->list) * sl->size);
}
unsigned int index = sl->count;